Commit Graph

3 Commits

Author SHA1 Message Date
Dave Ward
507c4d8bf8 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
2012-06-02 07:56:08 +00:00
Dave Ward
1236e1ef84 Merged V4.0-BUG-FIX to HEAD
36800: Fix for ALF-14217 - Repository link in the repository view of Share fails to link to Company Home metadata details page
   36801: ALF-13465: Ensure that linked folders go to folder-details and not document-details page
   36802: ALF-11027: Merge DEV/MAVEN-POC to V4.0-BUG-FIX
      36757: ALF-11027: remove spurious comment
      36593: ALF-11027: Fixed running from enterpriseprojects folder and strenghtened error messaging. Maven deployment needs to be run in -f continuous.xml environment and fails when set-build-number was not called in advance
   36803: ALF-13775: Set correct status code on missing index package doc response (updated Surf libs r1082)
   36805: Tweak exception inheritence to better fit with transaction rollbacks
   36806: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX:
      36556: A useful collection conversion utility method.
   36827: Record which CloudSyncLocal2 changes already been manually merged in
   36859: Merged V4.0 to V4.0-BUG-FIX
      36854: Part 2 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
      - add id to avoid many changesets with the same timestamp
      36855: Part 3 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 original patch again ...
   36861: Merged V4.0 to V4.0-BUG-FIX
      36852: ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0 (4.0.2)
         <<< Extra change required for 4.0.x in alfresco-macros.lib.ftl >>>
         36851: ALF-13667 Additional OpenOffice mimetypes to be added to the mime-type maps
            - Added mime-type mappings to alfresco.js


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-05-24 10:29:48 +00:00
Dave Ward
1029814dbe Merged V4.0-BUG-FIX to HEAD
36744: Fix for ALF-14227: "Bulk Filesystem In-place Import Tool: 'Replace existing files' option is not working - it is enabled when the check-box was unchecked"
   36745: Fix for ALF-13355: "CMIS: Error occurs trying to delete a multilingual document"
   36763: ALF-14226: User with '@' symbol in username cannot login
   - note: related to ALF-13755
   36795: Merged V4.0 to V4.0-BUG-FIX
      36779: 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
      36794: ALF-14094: Correction to from address generation for invitation reject email
   36796: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36765: Merged V4.0-BUG-FIX to V4.0
         36763: ALF-14226: User with '@' symbol in username cannot login
         - note: related to ALF-13755
   36797: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36773: Merged DEV to V3.4-BUG-FIX (with improvements)
         36739: ALF-11835 : Authentication chain should be validated
            The existence of a subsystem in a chain is validated by a check for presence of the corresponding resources.
      36784: ALF-10181 Missing files from enterprise SDK
         - Added missing Enterprise Config
      36793: (RECORD ONLY) ALF-12776: Correction to from address generation for invitation reject email


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-05-23 13:43:40 +00:00