Merged V4.1-BUG-FIX to HEAD

47526: ALF-13949: Copying folder which contains working copy doesn't work properly.
   - Correct recursive copy and FileFolderService copy to respect the working copy renaming behaviour from ETHREEOH-2762
   - Fix researched by Alex Bykov
   47563: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX
      47529: ALF-18207: Alfresco not starting with WQS module applied
      - Regression caused by change in surf constructor behaviour
      47536: ALF-18249: Alfresco doesn't start with Kerberos or NTLM authentification - Authentication filters do not demarcate transactions
      - Precautionary fix to restore existing behaviour regressed by ALF-17979
      - Don't try to use transactional caches if there is no transaction
      - Moving authentication filters to public PersonService would add necessary transaction demarcation, but may cause regressions due to permission evaluation
   47565: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX (RECORD ONLY)
      47500: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         47497: Fixed ALF-13679 "Cannot play a movie file in Preview, which has double byte characters in the file name"
         - Fix from previous commit where a typo sneaked in just before commit
      47517: ALF-18243: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         47508: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX
            47448: Optimize ApplicationScriptUtils.toJSON() - threadlocal cache for namespace resolution to avoid DD access, smarter retrieval of cm:person properties - 40% quicker or more in some cases
                   Convert short qnames to long qnames in our templates to avoid DD access to resolve full qnames
                   Optimize out N+1 queries from calling RatingService.getRating() unless the document has at least one Like (which is available in the rolled up property already present on the node) - up to 99% quicker when building "Likes" JSON structure...!
                   Added new optimized method to FileFolderService to retrieve a cm:name based path
            47484: Fix exception throw in FileFolderServiceImpl.getNameOnlyPath() to ensure only FileNotFoundException is thrown not RuntimeException to pass unit test.
            47504: Performance improvements to retrieving lists of nodes and single nodes.
                   - no longer perform N+1 queries to get thumbnails when retrieving nodes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2013-03-05 12:14:18 +00:00
parent 459ae26216
commit e3321be8d8

View File

@@ -125,7 +125,7 @@ public class WebClientConfigBootstrap implements ApplicationContextAware, BeanNa
{
if (configService != null && this.configs != null && this.configs.size() != 0)
{
UrlConfigSource configSource = new UrlConfigSource(this.configs);
UrlConfigSource configSource = new UrlConfigSource(this.configs, true);
return configService.appendConfig(configSource);
}