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.3 to HEAD

Browse Source 
20167: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20166: Fix ALF-2765: Renditions created via 3.3 RenditionService are not exposed via OpenCMIS rendition API
   20232: Fix problem opening AVM web project folders via FTP. ALF-2738.
   20234: ALF-2352: Cannot create folders in Share doclib without admin user in authentication chain
   20235: Fix for unable to create folders in web project via CIFS. ALF-2736.
   20258: Reverse-merged rev 20254: 'When dropping the mysql database ...'
   20262: Merged V3.3-BUG-FIX to V3.3
      20251: Fix for ALF-2804 - Unable to browse into folders in Share Site in certain situations.
              - Browser history filter object in incorrect state after page refresh.
   20264: Updated Oracle build support (to fix grants)
   20282: Merged PATCHES/V3.2.0 to V3.3
      20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
      20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
   20283: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20194: AVMTestSuite - scale down unit tests (slightly)
      20247: AVMServiceTest.testVersionByDate - build (add delay)
   20290: Fixed ALF-2851 "Drag n Drop issues in IE6 & IE7"
      - Reordering rules-list with drag and drop didn't work at all because each rule was created using a template that had the "id"-attribute set, which made IE confused after using HTMLELement.clone() even though the id was resetted
      - Both customise-dashlets & rules-list got an error when "throwing" away the dashlet or rule instead of releasing it "carefully", reason was becuuase IE didnt capture the x:y-position which made the animation fail. Now no animation is done if x:y isn't found.
   20296: Merged PATCHES/V3.1.0 to V3.3 (RECORD ONLY)
      20249: Merged V3.1 to PATCHES/V3.1.0
         14565: Updated version to include revision number (x.y.z)
      20246: Merged V3.1 to PATCHES/V3.1.0
         13841: Build fix
      20245: Merged V3.1 to PATCHES/V3.1.0
         16185: AbstractLuceneIndexerAndSearcherFactory.getTransactionId() must return null when there is no transaction
      20241: Merged V3.1 to PATCHES/V3.1.0
         14187: Fix for ETHREEOH-2023: LDAP import must lower case the local name of the association to person.
         16167: ETHREEOH-2475: Fixed nested transaction handling in AbstractLuceneIndexerAndSearcherFactory to allow duplicate user processing in PersonServiceImpl to actually work
         16168: ETHREEOH-2797: Force patch.db-V2.2-Person to apply one more time to fix up corrupt users created by LDAP Import
            - Problem due to ETHREEOH-2023, fixed in 3.1.1
            - Also corrects ldap.synchronisation.defaultHomeFolderProvider to be userHomesHomeFolderProvider
            - Also requires fix to ETHREEOH-2475 to fix up duplicate users
      20221:Merged PATCHES/V3.1.2 to PATCHES/V3.1.0
         20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
            19793: Merged HEAD to V3.2.0
               19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
               19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
                  Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
                  Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
                  I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
               19707: Return value from isTransformationBlocked was inverted. Fixed now.
               19705: Refinement of previous check-in re OOo transformations.
                  I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
               19702: Fix for HEAD builds running on panda build server.
                  OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
                  It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
      20220: Created hotfix branch off TAGS/ENTERPRISE/V3.1.0
   20297: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
      20268: Increment version number
      20267: ALF-550: Merged V3.2 to PATCHES/V3.1.2
         17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
            17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied
      20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
         19793: Merged HEAD to V3.2.0
            19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
            19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
               Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
               Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
               I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
            19707: Return value from isTransformationBlocked was inverted. Fixed now.
            19705: Refinement of previous check-in re OOo transformations.
               I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
            19702: Fix for HEAD builds running on panda build server.
               OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
               It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
      20204: Moved version label to '.6'
   20298: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
      20281: Incremented version number to '10'
      20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
         Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
            18490: Added cache for alf_content_data
         Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
            20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
   20299: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY)
      20279: Incremented version label
      20211: Reinstated patch 'patch.convertContentUrls' (reversed rev 20205 ALF-2719)
      20210: Incremented version label to '.3'
      20206: Bumped version label to '.2'
      20205: Workaround for ALF-2719 by disabling patch.convertContentUrls and ContentStoreCleaner
      20149: Incremented version label
      20101: Created hotfix branch off ENTERPRISE/V3.2.1
   20300: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/V3.3:
      20293: ALF-767: remove-AVM-issuer.sql upgrade does not account for column (mis-)order - fixed for MySQL, PostgreSQL and Oracle (DB2 & MS SQL Server already OK)
   20301: Merged PATCHES/V3.2.1 to V3.3
      20278: ALF-206: Make it possible to follow hyperlinks to document JSF client URLs from MS Office
         - A request parameter rather than a (potentially forgotten) session attribute is used to propagate the URL to redirect to after successful login
   20303: Fixed ALF-2855: FixAuthorityCrcValuesPatch reports NPE during upgrade from 2.1.7 to 3.3E
      - Auto-unbox NPE on Long->long: Just used the Long directly for reporting
   20319: Fixed ALF-2854: User Usage Queries use read-write methods on QNameDAO
   20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception
      - Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection
      - Fixed queries to check for dereferencing AND use the indexed orphan_time column
      - More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted
      - Added optimistic lock checks on updates and deletes of alf_content_url
   20335: Merged DEV/V3.3-BUG-FIX to V3.3
      20334: ALF-2473: Changes for clean startup and shutdown of subsystems on Spring 3
         - Removed previous SafeEventPublisher workaround for startup errors and associated changes
         - Replaced with SafeApplicationEventMulticaster which queues up events while an application context isn't started
         - Now all subsystems shut down cleanly
         - Fixes problem with FileContentStore visibility in JMX too!
   20341: ALF-2517 Quick fix which means rules which compare the creation/modification date of content should now correctly be applied when content is uploaded to a folder.
   20346: ALF-2839: Node pre-loading generates needless resultset rows
      - Added missing Criteria.list() call
   20347: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
   20356: Merged DEV/BELARUS/HEAD-2010_03_30 to V3.3 (with corrections)
      19735: ALF-686: Alfresco cannot start if read/write mode in Sysadmin subsystem is configured
         1. org.alfresco.repo.module.ModuleComponentHelper was modified to allow “System” user run write operations in read-only system.
         2. Startup of “Synchronization” subsystem failed with the same error as was occurred in issue during modules start. org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizer was also modified to allow “System” user run write operations in read-only mode.
   20361: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20345: Fix ALF-2319: CMIS 'current' version mapping is not compliant with spec
      20354: Update test to reflect changes to CMIS version mapping.
   20363: Merge from V3.2 to V3.2 (all record-only)
      c. 19448 OOoJodConverter worker bean correctly handles isAvailable() when subsystem is disabled.
      c. 19484 JodConverter-backed thumbnailing test now explicitly sets OOoDirect and OOoJodconverter enabled-ness back to default settings in tearDown
      c. 20175 Fix for ALF-2773 JMX configuration of enterprise logging broken
   20376: Altered URL of online help to point at http://www.alfresco.com/help/33/enterprise/webeditor/
   20395: set google docs off
   20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered
      - Setting ContentData that was derived outside of the current transaction opened up a window
        for the post-rollback code to delete the underlying binary. The binaries are only registered
        for writers fetched via the ContentService now; the low-level DAO no longer does management
        because it can't assume that a new content URL indicates a new underlying binary.
      - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up
        live content when retrying collisions took place. The cleanup is no longer on the stack
        for the patch.
      - Removes the ALF-558 changes around ContentData.reference()
   20399: Remove googledocs aspect option
   20400: PurgeTestP (AVM) - increase wait cycles
   20422: Added ooo converter properties
   20425: Merge V3.3-BUG-FIX to V3.3
      20392 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English
      20365 : Merge DEV to V3.3-BUG_FIX     
         18011 : ETHREEOH-3804 - IMAP message body doesn't appears in IMAP folder when message subject is equal to the attachment name
      20332 : Build fix - rework to the ImapServiceUnit tests.
      20325 : build fix
      20318 : MERGE DEV TO V3.3-BUG-FIX    
         20287 : ALF-2754: Alfresco IMAP and Zimbra Desktop Client.
      20317 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English   This change reworks the received date metadata extraction.
      20316 : ALF-1912 : Problem with IMAP Sites visibility   Now only IMAP favouries are shown.   Also major rework to the way that this service uses the FileFolderService.
      20315 : ALF-1912 Updates to the FileFolderService to support the Imap Service    - add listDeepFolders    - remove "makeFolders" which moves to its own Utility class.    - update to JavaDoc
   20429: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20171: 3.3SP1 bug fix branch
      20174: Fix for ALF-960 and ALFCOM-1980: WCM - File Picker Restriction relative to folder not web project
      20179: ALF-2629 Now when a workflow timer signals a transition it also ends the associated task.
   20433: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20184: ALF-2772: Added new test case to RepoTransferReceiverImplTest and fixed the fault in the primary manifest processor.
      20196: Temporary fix to SandboxServiceImplTest, which reverses the fix to ALF-2529.
   20434: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (RECORD ONLY)
      20213: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
         r20176 Merge from V3.2 to V3.3.
             r20175. JMX configuration of enterprise logging broken (fix).
      20215: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
         r20178 JodConverter loggers are now exposed in JMX.
      20218: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         20195: Form fields for numbers are now rendered much smaller that ...
      20248: (RECORD ONLY) Merging HEAD into V3.3
      20284: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         20177: Add 'MaxPermSize' setting for DOD JUnit tests
      20305: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         20236: Add Oracle support for creating/dropping "databases" (users) in continuous.xml
         20264: Updated Oracle build support (to fix grants)
   20435: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20233: Part fix for ALF-2811: DOD5015 module breaks CMIS tck
      20239: Final part of fix for ALF-2811: DOD5015 module breaks CMIS tck
      20250: Merge from DEV/BELARUS/HEAD-2010_04_28 to V3.3-BUG-FIX
         20230 ALF-2450: latin/utf-8 HTML file cannot be text-extracted.
      20253: ALF-2629 Now tasks should correctly be ended when an associated timer is triggered. Should no longer cause WCM workflows to fail.
      20254: ALF-2579 Changed teh status code on incorrect password to '401' to reflect that it is an authorisation error.
      20263: Fix for ALF-2500: query with a ! in contains search make it strange
      20265: Fix for ALF-1495. Reindexing of OOo-transformed content after OOo crash.
   20436: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20292: (RECORD ONLY) Latest SpringSurf libs:
      20308: (RECORD ONLY) Latest SpringSurf libs:
      20366: (RECORD ONLY) Latest SpringSurf libs:
      20415: Latest SpringSurf libs:
   20437: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20270: Build times: SearchTestSuite
      20273: Fix for ALF-2125 - Accessing a deleted page in Share does not return an error page, instead the document-details page breaks
      20274: Fix for ALF-2518: It's impossible to find user by user name in Add User or Group window at Manage permissions page (also allows users to be found by username in the Share Admin Console).
      20277: Fix for ALF-2417: Create Web Content Wizard if cancelling/aborting Step Two - Author Web Content, any asset being uploaded gets locked
      20291: Reduce build time: Added security test suite to cover 17 security tests 
   20439: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20302: Fixed ALF-727:  Oracle iBatis fails on PropertyValueDAOTest Double.MAX_VALUE
      20307: VersionStore - minor fixes if running deprecated V1 
      20310: Fixed a bug in UIContentSelector which was building lucene search queries incorrectly.
      20314: Fix for ALF-2789 - DispatcherServlet not correctly retrieving Object ID from request parameters
      20320: Merged DEV/TEMPORARY to V3.3-BUG-FIX
         20313: ALF-2507: Not able to email space users even if the user owns the space 
      20324: Fixed ALF-2078 "Content doesn't make checked in after applying 'Check-in' rule in Share"
      20327: Fix Quickr project to compile in Eclipse
      20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch
      20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete
      20369: Part 1 of fix for ALF-2943: Update incorrect mimetypes (Excel and Powerpoint)
      20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers
      20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334)
      20378: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
         20312: ALF-2162: Error processing WCM form: XFormsBindingException: property 'constraint' already present at model item
      20381: Fixed ALF-2943: Update incorrect mimetypes (Excel and Powerpoint)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-06-09 14:01:07 +00:00
parent 0097d5a092
commit a5f31cd37e
125 changed files with 4282 additions and 1911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
View File

@@ -35,7 +35,6 @@ import org.alfresco.util.ApplicationContextHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEventPublisher;
/**
* Abstract base class that provides a set of tests for implementations
@@ -53,7 +52,6 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
private static Log logger = LogFactory.getLog(AbstractReadOnlyContentStoreTest.class);
protected ApplicationEventPublisher applicationEventPublisher;
protected TransactionService transactionService;
private UserTransaction txn;
@@ -68,7 +66,6 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
@Override
public void setUp() throws Exception
{
applicationEventPublisher = (ApplicationEventPublisher) ctx.getBean("applicationEventPublisher");
transactionService = (TransactionService) ctx.getBean("TransactionService");
txn = transactionService.getUserTransaction();
txn.begin();

28
source/java/org/alfresco/repo/content/ContentServiceImpl.java
View File

@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.springframework.extensions.surf.util.I18NUtil;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.content.ContentServicePolicies.OnContentPropertyUpdatePolicy;
@@ -57,14 +56,16 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.TransformationOptions;
import org.alfresco.service.cmr.usage.ContentQuotaException;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper;
import org.alfresco.util.Pair;
import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.extensions.surf.util.I18NUtil;
/**
* Service implementation acting as a level of indirection between the client
@@ -77,7 +78,7 @@ import org.springframework.context.ApplicationEventPublisher;
* @author Derek Hulley
* @since 3.2
*/
public class ContentServiceImpl implements ContentService
public class ContentServiceImpl implements ContentService, ApplicationContextAware
{
private static Log logger = LogFactory.getLog(ContentServiceImpl.class);
@@ -85,7 +86,7 @@ public class ContentServiceImpl implements ContentService
private NodeService nodeService;
private AVMService avmService;
private RetryingTransactionHelper transactionHelper;
private ApplicationEventPublisher applicationEventPublisher;
private ApplicationContext applicationContext;
/** a registry of all available content transformers */
private ContentTransformerRegistry transformerRegistry;
@@ -153,16 +154,14 @@ public class ContentServiceImpl implements ContentService
{
this.imageMagickContentTransformer = imageMagickContentTransformer;
}
/**
* Sets the application event publisher.
*
* @param applicationEventPublisher
* the new application event publisher
/* (non-Javadoc)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
this.applicationEventPublisher = applicationEventPublisher;
this.applicationContext = applicationContext;
}
/**
@@ -171,8 +170,7 @@ public class ContentServiceImpl implements ContentService
public void init()
{
// Set up a temporary store
this.tempStore = new FileContentStore(this.applicationEventPublisher, TempFileProvider.getTempDir()
.getAbsolutePath());
this.tempStore = new FileContentStore(this.applicationContext, TempFileProvider.getTempDir().getAbsolutePath());
// Bind on update properties behaviour
this.policyComponent.bindClassBehaviour(

99
source/java/org/alfresco/repo/content/RoutingContentServiceTest.java
View File

@@ -86,8 +86,8 @@ public class RoutingContentServiceTest extends TestCase
@Override
public void setUp() throws Exception
{
transactionService = (TransactionService) ctx.getBean("transactionComponent");
nodeService = (NodeService) ctx.getBean("dbNodeService");
transactionService = (TransactionService) ctx.getBean("TransactionService");
nodeService = (NodeService) ctx.getBean("NodeService");
contentService = (ContentService) ctx.getBean(ServiceRegistry.CONTENT_SERVICE.getLocalName());
this.policyComponent = (PolicyComponent) ctx.getBean("policyComponent");
this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
@@ -705,6 +705,7 @@ public class RoutingContentServiceTest extends TestCase
return isDone;
}
@SuppressWarnings("unused")
public Throwable getError()
{
return error;
@@ -827,4 +828,98 @@ public class RoutingContentServiceTest extends TestCase
txn.commit();
txn = null;
}
/**
* Ensure that content URLs outside of a transaction are not touched on rollback.
*/
public void testRollbackCleanup_ALF2890() throws Exception
{
ContentWriter updatingWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, true);
updatingWriter.putContent("STEP 1");
txn.commit();
txn = null;
ContentReader readerStep1 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
assertEquals("Incorrect content", "STEP 1", readerStep1.getContentString());
ContentWriter simpleWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, false);
simpleWriter.putContent("STEP 2");
readerStep1 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
assertEquals("Incorrect content", "STEP 1", readerStep1.getContentString());
// Update the content
nodeService.setProperty(contentNodeRef, ContentModel.PROP_CONTENT, simpleWriter.getContentData());
ContentReader readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
simpleWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, false);
simpleWriter.putContent("STEP 3");
ContentReader readerStep3 = simpleWriter.getReader();
assertEquals("Incorrect content", "STEP 3", readerStep3.getContentString());
readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
// Now get a ex-transaction writer but set the content property in a failing transaction
// Notice that we have already written "STEP 3" to an underlying binary
final ContentData simpleWriterData = simpleWriter.getContentData();
RetryingTransactionCallback<Void> failToSetPropCallback = new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
nodeService.setProperty(contentNodeRef, ContentModel.PROP_CONTENT, simpleWriterData);
throw new RuntimeException("aaa");
}
};
try
{
transactionService.getRetryingTransactionHelper().doInTransaction(failToSetPropCallback);
}
catch (RuntimeException e)
{
if (!e.getMessage().equals("aaa"))
{
throw e;
}
// Expected
}
// The writer data should not have been cleaned up
readerStep3 = simpleWriter.getReader();
assertTrue("Content was cleaned up when it originated outside of the transaction", readerStep3.exists());
assertEquals("Incorrect content", "STEP 3", readerStep3.getContentString());
// The node's content must be unchanged
readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
// Test that rollback cleanup works for writers fetched in the same transaction
final ContentReader[] readers = new ContentReader[1];
RetryingTransactionCallback<Void> rollbackCallback = new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
ContentWriter writer = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, true);
writer.putContent("UNLUCKY CONTENT");
ContentReader reader = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
assertEquals("Incorrect content", "UNLUCKY CONTENT", reader.getContentString());
assertEquals("Incorrect content", "UNLUCKY CONTENT", writer.getReader().getContentString());
readers[0] = reader;
throw new RuntimeException("aaa");
}
};
try
{
transactionService.getRetryingTransactionHelper().doInTransaction(rollbackCallback);
}
catch (RuntimeException e)
{
if (!e.getMessage().equals("aaa"))
{
throw e;
}
// Expected
}
// Make sure that the content has been cleaned up
assertFalse("Content was not cleaned up after having been created in-transaction", readers[0].exists());
}
}

6
source/java/org/alfresco/repo/content/RoutingContentStoreTest.java
View File

@@ -59,13 +59,13 @@ public class RoutingContentStoreTest extends AbstractWritableContentStoreTest
File tempDir = TempFileProvider.getTempDir();
// Create a subdirectory for A
File storeADir = new File(tempDir, "A");
storeA = new FileContentStore(applicationEventPublisher, storeADir);
storeA = new FileContentStore(ctx, storeADir);
// Create a subdirectory for B
File storeBDir = new File(tempDir, "B");
storeB = new FileContentStore(applicationEventPublisher, storeBDir);
storeB = new FileContentStore(ctx, storeBDir);
// Create a subdirectory for C
File storeCDir = new File(tempDir, "C");
storeC = new DumbReadOnlyFileStore(new FileContentStore(applicationEventPublisher, storeCDir));
storeC = new DumbReadOnlyFileStore(new FileContentStore(ctx, storeCDir));
// No subdirectory for D
storeD = new SupportsNoUrlFormatStore();
// Create the routing store

31
source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
View File

@@ -30,21 +30,23 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.tenant.Tenant;
import org.alfresco.repo.tenant.TenantDeployer;
import org.alfresco.repo.tenant.TenantService;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
/**
* Content Store that supports tenant routing, if multi-tenancy is enabled.
*
* Note: Need to initialise before the dictionary service, in the case that models are dynamically loaded for the tenant.
*/
public class TenantRoutingFileContentStore extends AbstractRoutingContentStore implements TenantDeployer
public class TenantRoutingFileContentStore extends AbstractRoutingContentStore implements TenantDeployer, ApplicationContextAware
{
// cache of tenant file stores
Map<String, FileContentStore> tenantFileStores = new ConcurrentHashMap<String, FileContentStore>();
private String defaultRootDirectory;
private TenantService tenantService;
private ApplicationEventPublisher applicationEventPublisher;
private ApplicationContext applicationContext;
public void setDefaultRootDir(String defaultRootDirectory)
@@ -56,18 +58,17 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
{
this.tenantService = tenantService;
}
/**
* Sets the application event publisher.
*
* @param applicationEventPublisher
* the new application event publisher
*/
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
{
this.applicationEventPublisher = applicationEventPublisher;
}
/*
* (non-Javadoc)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
* ApplicationContext)
*/
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
this.applicationContext = applicationContext;
}
@Override
protected ContentStore selectWriteStore(ContentContext ctx)
{
@@ -130,7 +131,7 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
tenantDomain = tenant.getTenantDomain();
}
putTenantFileStore(tenantDomain, new FileContentStore(this.applicationEventPublisher, new File(rootDir)));
putTenantFileStore(tenantDomain, new FileContentStore(this.applicationContext, new File(rootDir)));
}
public void destroy()

35
source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
View File

@@ -19,7 +19,9 @@
package org.alfresco.repo.content.cleanup;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.domain.avm.AVMNodeDAO;
@@ -33,12 +35,12 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.Pair;
import org.alfresco.util.PropertyCheck;
import org.alfresco.util.VmShutdownListener;
import org.alfresco.util.VmShutdownListener.VmShutdownException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.alfresco.util.Pair;
import org.alfresco.util.PropertyCheck;
/**
* This component is responsible cleaning up orphaned content.
@@ -328,26 +330,35 @@ public class ContentStoreCleaner
private int cleanBatch(final int batchSize)
{
final List<Long> idsToDelete = new ArrayList<Long>(batchSize);
// Get a bunch of cleanable URLs
final Map<Long, String> urlsById = new HashMap<Long, String>(batchSize * 2);
ContentUrlHandler contentUrlHandler = new ContentUrlHandler()
{
public void handle(Long id, String contentUrl, Long orphanTime)
{
// Pass the content URL to the eager cleaner for post-commit handling
eagerContentStoreCleaner.registerOrphanedContentUrl(contentUrl, true);
idsToDelete.add(id);
urlsById.put(id, contentUrl);
}
};
final long maxOrphanTime = System.currentTimeMillis() - (protectDays * 24 * 3600 * 1000);
contentDataDAO.getContentUrlsOrphaned(contentUrlHandler, maxOrphanTime, batchSize);
// All the URLs have been passed off for eventual deletion.
// Just delete the DB data
int size = idsToDelete.size();
if (size > 0)
// Shortcut, if necessary
if (urlsById.size() == 0)
{
contentDataDAO.deleteContentUrls(idsToDelete);
return 0;
}
// We have the IDs of the URLs to delete. Let's do it!
List<Long> idsToDelete = new ArrayList<Long>(urlsById.keySet());
contentDataDAO.deleteContentUrls(idsToDelete);
// No problems, so far (ALF-1998: contentStoreCleanerJob leads to foreign key exception)
// Schedule the URLs for deletion in the post-commit phase
for (String contentUrlToDelete : urlsById.values())
{
// NOTE: We are forcing eager cleanup so ignore the return value.
eagerContentStoreCleaner.registerOrphanedContentUrl(contentUrlToDelete, true);
}
// Done
return size;
return urlsById.size();
}
}

29
source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
View File

@@ -140,28 +140,47 @@ public class EagerContentStoreCleaner extends TransactionListenerAdapter
/**
* Queues orphaned content for post-transaction removal
* <p/>
* <b>NB: </b>Any content registered <u>will</u> be deleted if the current transaction
* commits and if 'eager' cleanup is turned on.
*
* @return Returns <tt>true</tt> if the content was scheduled for post-transaction deletion.
* If the return value is <tt>true</tt> then the calling code <b>must</b> delete
* the row entry for the content URL provided <b>BEFORE THE TRANSACTION COMMITS!</b>
*/
public void registerOrphanedContentUrl(String contentUrl)
public boolean registerOrphanedContentUrl(String contentUrl)
{
registerOrphanedContentUrl(contentUrl, false);
return registerOrphanedContentUrl(contentUrl, false);
}
/**
* Queues orphaned content for post-transaction removal
* <p/>
* <b>NB: </b>Any content registered <u>will</u> be deleted if the current transaction
* commits and if 'eager' cleanup is turned on.
*
* @param force <tt>true</tt> for force the post-commit URL deletion
* regardless of the setting {@link #setEagerOrphanCleanup(boolean)}.
* @return Returns <tt>true</tt> if the content was scheduled for post-transaction deletion.
* If the return value is <tt>true</tt> then the calling code <b>must</b> delete
* the row entry for the content URL provided <b>BEFORE THE TRANSACTION COMMITS!</b>
*/
public void registerOrphanedContentUrl(String contentUrl, boolean force)
public boolean registerOrphanedContentUrl(String contentUrl, boolean force)
{
if (!eagerOrphanCleanup && !force)
{
return;
return false;
}
Set<String> urlsToDelete = TransactionalResourceHelper.getSet(KEY_POST_COMMIT_DELETION_URLS);
urlsToDelete.add(contentUrl);
// Register to listen for transaction commit
AlfrescoTransactionSupport.bindListener(this);
// Done
if (logger.isDebugEnabled())
{
logger.debug("Scheduled content for post-commit eager cleanup: " + contentUrl);
}
return true;
}
/**
@@ -218,7 +237,7 @@ public class EagerContentStoreCleaner extends TransactionListenerAdapter
{
logger.debug(" " + (urlsToDelete.size() - 10) + " more ...");
}
else
else if (count < 10)
{
logger.debug(" Deleting content URL: " + contentUrl);
}

62
source/java/org/alfresco/repo/content/filestore/FileContentStore.java
View File

@@ -38,8 +38,12 @@ import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
/**
* Provides a store of node content directly to the file system. The writers
@@ -50,7 +54,7 @@ import org.springframework.context.ConfigurableApplicationContext;
*
* @author Derek Hulley
*/
public class FileContentStore extends AbstractContentStore
public class FileContentStore extends AbstractContentStore implements ApplicationContextAware, ApplicationListener
{
/**
* <b>store</b> is the new prefix for file content URLs
@@ -64,7 +68,7 @@ public class FileContentStore extends AbstractContentStore
private String rootAbsolutePath;
private boolean allowRandomAccess;
private boolean readOnly;
private ApplicationEventPublisher applicationEventPublisher;
private ApplicationContext applicationContext;
/**
* Private: for Spring-constructed instances only.
@@ -102,32 +106,32 @@ public class FileContentStore extends AbstractContentStore
/**
* Public constructor for programmatic use.
*
* @param applicationEventPublisher
* the application event publisher
* @param context
* application context through which events can be published
* @param rootDirectoryStr
* the root under which files will be stored. The directory will be created if it does not exist.
* @see FileContentStore#FileContentStore(File)
*/
public FileContentStore(ApplicationEventPublisher applicationEventPublisher, String rootDirectoryStr)
public FileContentStore(ApplicationContext context, String rootDirectoryStr)
{
this(rootDirectoryStr);
setApplicationEventPublisher(applicationEventPublisher);
publishEvent();
setApplicationContext(context);
publishEvent(context);
}
/**
* Public constructor for programmatic use.
*
* @param applicationEventPublisher
* the application event publisher
* @param context
* application context through which events can be published
* @param rootDirectory
* the root under which files will be stored. The directory will be created if it does not exist.
*/
public FileContentStore(ApplicationEventPublisher applicationEventPublisher, File rootDirectory)
public FileContentStore(ApplicationContext context, File rootDirectory)
{
this(rootDirectory);
setApplicationEventPublisher(applicationEventPublisher);
publishEvent();
setApplicationContext(context);
publishEvent(context);
}
@@ -142,16 +146,13 @@ public class FileContentStore extends AbstractContentStore
return sb.toString();
}
/**
* Sets the application event publisher.
*
* @param applicationEventPublisher
* the new application event publisher
/* (non-Javadoc)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
this.applicationEventPublisher = applicationEventPublisher;
this.applicationContext = applicationContext;
}
/**
@@ -630,9 +631,22 @@ public class FileContentStore extends AbstractContentStore
/**
* Publishes an event to the application context that will notify any interested parties of the existence of this
* content store.
*
* @param context
* the application context
*/
private void publishEvent()
private void publishEvent(ApplicationContext context)
{
this.applicationEventPublisher.publishEvent(new ContentStoreCreatedEvent(this));
context.publishEvent(new ContentStoreCreatedEvent(this));
}
public void onApplicationEvent(ApplicationEvent event)
{
// Once the context has been refreshed, we tell other interested beans about the existence of this content store
// (e.g. for monitoring purposes)
if (event instanceof ContextRefreshedEvent && event.getSource() == this.applicationContext)
{
publishEvent(((ContextRefreshedEvent) event).getApplicationContext());
}
}
}

6
source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
View File

@@ -46,8 +46,10 @@ public class FileContentStoreTest extends AbstractWritableContentStoreTest
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
+ getName());
store = new FileContentStore(ctx,
tempDir.getAbsolutePath() +
File.separatorChar +
getName());
}
@Override

6
source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
View File

@@ -43,8 +43,10 @@ public class NoRandomAccessFileContentStoreTest extends AbstractWritableContentS
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
+ getName());
store = new FileContentStore(ctx,
tempDir.getAbsolutePath() +
File.separatorChar +
getName());
// disallow random access
store.setAllowRandomAccess(false);
}

6
source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
View File

@@ -44,8 +44,10 @@ public class ReadOnlyFileContentStoreTest extends AbstractReadOnlyContentStoreTe
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
+ getName());
store = new FileContentStore(ctx,
tempDir.getAbsolutePath() +
File.separatorChar +
getName());
// disallow random access
store.setReadOnly(true);
}

18
source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
View File

@@ -31,6 +31,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -105,7 +106,7 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
private Set<String> supportedMimetypes;
private OverwritePolicy overwritePolicy;
private boolean failOnTypeConversion;
private Set<DateFormat> supportedDateFormats;
private Set<DateFormat> supportedDateFormats = new HashSet<DateFormat>(0);
private Map<String, Set<QName>> mapping;
private boolean inheritDefaultMapping;
@@ -134,7 +135,6 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
// Set defaults
overwritePolicy = OverwritePolicy.PRAGMATIC;
failOnTypeConversion = true;
supportedDateFormats = new HashSet<DateFormat>(0);
mapping = null; // The default will be fetched
inheritDefaultMapping = false; // Any overrides are complete
initialized = false;
@@ -260,8 +260,22 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
{
try
{
/**
* Regional date format
*/
DateFormat df = new SimpleDateFormat(dateFormatStr);
this.supportedDateFormats.add(df);
/**
* Date format can be locale specific - make sure English format always works
*/
/*
* TODO MER 25 May 2010 - Added this as a quick fix for IMAP date parsing which is always
* English regardless of Locale. Some more thought and/or code is required to configure
* the relationship between properties, format and locale.
*/
DateFormat englishFormat = new SimpleDateFormat(dateFormatStr, Locale.US);
this.supportedDateFormats.add(englishFormat);
}
catch (Throwable e)
{

2
source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
View File

@@ -30,7 +30,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.apache.poi.hsmf.MAPIMessage;
/**
* Outlook format email meta-data extractor extracting the following values:
* Outlook MAPI format email meta-data extractor extracting the following values:
* <pre>
* <b>sentDate:</b> -- cm:sentdate
* <b>originator:</b> -- cm:originator, cm:author

69
source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
View File

@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Map;
@@ -40,20 +41,20 @@ import org.alfresco.service.namespace.QName;
/**
* Metadata extractor for RFC822 mime emails.
*
* Default configuration: (see RFC822MetadataExtractor.properties)
*
* <pre>
* <b>messageFrom:</b> -- imap:messageFrom, cm:originator
* <b>messageTo:</b> -- imap:messageTo
* <b>messageCc:</b> -- imap:messageCc
* <b>messageSubject:</b> -- imap:messageSubject, cm:title, cm:description, cm:subjectline
* <b>messageSent:</b> -- imap:dateSent, cm:sentdate
* <b>messageReceived:</b> -- imap:dateReceived
* <b>All <code>{@link Header#getName() header names}:</b>
* <b>Thread-Index:</b> -- imap:threadIndex
* <b>Message-ID:</b> -- imap:messageId
* <b>date:</b> -- imap:dateReceived
*
* TIKA Note - to and cc are missing, and date stuff isn't
* great. Thread index is missing, and arbitrary headers
* don't seem to be supported
* </pre>
*
* @author Derek Hulley
* @since 3.2
@@ -66,6 +67,7 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
protected static final String KEY_MESSAGE_CC = "messageCc";
protected static final String KEY_MESSAGE_SUBJECT = "messageSubject";
protected static final String KEY_MESSAGE_SENT = "messageSent";
protected static final String KEY_MESSAGE_RECEIVED = "messageReceived";
public static String[] SUPPORTED_MIMETYPES = new String[] { MimetypeMap.MIMETYPE_RFC822 };
@@ -87,12 +89,50 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
if (mimeMessage != null)
{
//Extract values that doesn't match to headers and need to be encoded.
/**
* Extract RFC822 values that doesn't match to headers and need to be encoded.
* Or those special fields that require some code to extract data
*/
putRawValue(KEY_MESSAGE_FROM, InternetAddress.toString(mimeMessage.getFrom()), rawProperties);
putRawValue(KEY_MESSAGE_TO, InternetAddress.toString(mimeMessage.getRecipients(RecipientType.TO)), rawProperties);
putRawValue(KEY_MESSAGE_CC, InternetAddress.toString(mimeMessage.getRecipients(RecipientType.CC)), rawProperties);
putRawValue(KEY_MESSAGE_SENT, mimeMessage.getSentDate(), rawProperties);
/**
* Received field from RFC 822
*
* "Received" ":" ; one per relay
* ["from" domain] ; sending host
* ["by" domain] ; receiving host
* ["via" atom] ; physical path
* ("with" atom) ; link/mail protocol
* ["id" msg-id] ; receiver msg id
* ["for" addr-spec] ; initial form
* ";" date-time ; time received
*/
Date rxDate = mimeMessage.getReceivedDate();
if(rxDate != null)
{
// The email implementation extracted the received date for us.
putRawValue(KEY_MESSAGE_RECEIVED, rxDate, rawProperties);
}
else
{
// the email implementation did not parse the received date for us.
String[] rx = mimeMessage.getHeader("received");
if(rx != null && rx.length > 0)
{
String lastReceived = rx[0];
int x = lastReceived.indexOf(';');
if(x > 0)
{
String dateStr = lastReceived.substring(x + 1).trim();
putRawValue(KEY_MESSAGE_RECEIVED, dateStr, rawProperties);
}
}
}
String[] subj = mimeMessage.getHeader("Subject");
if (subj != null && subj.length > 0)
{
@@ -108,7 +148,9 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
putRawValue(KEY_MESSAGE_SUBJECT, decodedSubject, rawProperties);
}
//Extract values from headers
/*
* Extract values from all header fields, including extension fields "X-"
*/
Set<String> keys = getMapping().keySet();
Enumeration<Header> headers = mimeMessage.getAllHeaders();
while (headers.hasMoreElements())
@@ -148,15 +190,4 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
{
return super.getMapping();
}
// /**
// * Back door for RM
// * @return
// */
// public void setMapping(Map<String, Set<QName>> mapping)
// {
// super.setMapping(mapping);
// }
}

8
source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
View File

@@ -8,15 +8,15 @@ namespace.prefix.cm=http://www.alfresco.org/model/content/1.0
# Mappings
#Default values that doesn't match to Header
#Default values that doesn't match exactly to Header
messageFrom=imap:messageFrom, cm:originator
messageTo=imap:messageTo
messageCc=imap:messageCc
messageSubject=imap:messageSubject, cm:title, cm:description, cm:subjectline
messageSent=imap:dateSent, cm:sentdate
messageReceived=imap:dateReceived
#Add here any values you want to extract. Use Header name for key.
#Add here any values you want to extract.
# Use Header name for key. LHS is a list of the destination properties.
Thread-Index=imap:threadIndex
Message-ID=imap:messageId
Date=imap:dateReceived

2
source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
View File

@@ -64,7 +64,7 @@ public class ReplicatingContentStoreTest extends AbstractWritableContentStoreTes
File tempDir = TempFileProvider.getTempDir();
// create a primary file store
String storeDir = tempDir.getAbsolutePath() + File.separatorChar + GUID.generate();
primaryStore = new FileContentStore(applicationEventPublisher, storeDir);
primaryStore = new FileContentStore(ctx, storeDir);
// create some secondary file stores
secondaryStores = new ArrayList<ContentStore>(3);
for (int i = 0; i < 4; i++)