mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V4.0-BUG-FIX to HEAD
37207: BDE-69: Filter more tests for minimal build plan
37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
- also fixes deletion of secondary associations
37265: Merged V4.0 to V4.0-BUG-FIX
37224: ALF-14174: Part 14 for ALF-14237 Upgrades from 4.0.0.x/4..0.1.0 will not fix the timestamps on acl changesets - SOLR will skip ACLs set prior to upgrade
- Fix syntax error on Oracle
37250: Fix for ALF-14174 The patch adding timestamps to acl_change_set breaks SOLR tracking
- better cross DB fix
37298: ALF-14365 - added hazelcastConfig.xml.sample
37323: ALF-13247: Two nodes with the same primary path.
-Fixed by initializing zone before parallel batch processing begins.
37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
ALF-13452 Open office startup from Java not working on OSX
- Added code to start LibreOffice 3.5 on Mac (requires different options to the command and
ure-link is a directory rather than a file on mac)
- Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac
so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then
creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH
- Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels
(saves N.N.N.N.N.N getting mixed up with text)
37340: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) RECORD ONLY
37339: ALF-13452: Merged V4.0-BUG-FIX (4.0.3) to V3.4-BUG-FIX (3.4.10)
37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
ALF-13452 Open office startup from Java not working on OSX
- Added code to start LibreOffice 3.5 on Mac (requires different options to the command and
ure-link is a directory rather than a file on mac)
- Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac
so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then
creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH
- Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels
(saves N.N.N.N.N.N getting mixed up with text)
36273: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
- Return a dummy OpenOffice command even when there is no OpenOffice/LibreOffice installed or on the path.
36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
- remove old jodconverter-core-3.0-beta-3.diff
36259: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
<< Developed on Windows 7. Might need more work on Linux to get LibreOffice to shut down, but should be
okay with OpenOffice 3.2 which was used in the previous release. >>
- Updated jodconverter to latest version jodconverter-core-3.0-SNAPSHOT-patched.jar 28/4/2012 which is newer
than 3.0 beta-4
- Applied patch for http://code.google.com/p/jodconverter/issues/detail?id=103 to handle setting the env
for LibreOffice 3.5
- Modified code to use partial GNU style options (not used for -env!) when using LibreOffice
- Added OpenOfficeCommandLine to dynamically supply OpenOffice or LibreOffice command line args for OOoDirect
- Tested to work with OpenOffice 3.4 and 3.2 on Windows 7
37353: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3)
37352: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
- Build test failure
37359: New JUnit Rule to support automatic creation and cleanup of Share sites in test code.
This is required for an imminent fix to ALF-14345, but I'm checking it in separately in order to merge this general utility.
37360: Fix for ALF-14345. Site Service list method does not recognise sub-types of st:site.
37364: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) RECORD ONLY (not needed in 4.0.x)
37363: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
- Build test failure x2 (reference to jodconverter*jar not needed in 4.0.x)
37370: Merged V3.4-BUG-FIX:
ALF-11714: Updated WCMQS to ensure all FreeMarker variables output to HTML are protected with ?html to prevent XSS
37382: Translation (DE, IT, JA, NL) updates from Gloria, based on EN rev37081
37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
37386: Merged V4.0 to V4.0-BUG-FIX
37385: ALF-14238: Fix by Dmitry to correct iteration in ImapUnsubscribedAspectPatch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -760,6 +760,17 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
|
||||
// Create a prefixed zone ID for use with the authority service
|
||||
final String zoneId = AuthorityService.ZONE_AUTH_EXT_PREFIX + zone;
|
||||
|
||||
// Ensure that the zoneId exists before multiple threads start using it
|
||||
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
|
||||
{
|
||||
@Override
|
||||
public Void execute() throws Throwable
|
||||
{
|
||||
authorityService.getOrCreateZone(zoneId);
|
||||
return null;
|
||||
}
|
||||
}, false, splitTxns);
|
||||
|
||||
// The set of zones we associate with new objects (default plus registry specific)
|
||||
final Set<String> zoneSet = getZones(zoneId);
|
||||
|
||||
@@ -1856,7 +1867,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
|
||||
* the zone id
|
||||
* @return the zone set
|
||||
*/
|
||||
private Set<String> getZones(String zoneId)
|
||||
private Set<String> getZones(final String zoneId)
|
||||
{
|
||||
Set<String> zones = new HashSet<String>(5);
|
||||
zones.add(AuthorityService.ZONE_APP_DEFAULT);
|
||||
|
||||
Reference in New Issue
Block a user