Commit Graph

287 Commits

Author SHA1 Message Date
Alex Mukha
c0c2a9c1d1 Merged DEV (5.1) to HEAD (5.1)
117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
   117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
      - Updated the BehaviourFilter interface accordingly.,
   115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
      - Modified the isEnabled(QName className) to correspond with the new logic
      - Modified the JUnit tests.,
   115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
   115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Added new API for disabling behaviours.
      - Added JUnit tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-18 17:13:08 +00:00
Jean-Pierre Huynh
43f68c654c Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)
117183 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship
      - Remove Pdf2Swf specific transformer config from transformers.properties and spring context.xml
      - Remove references to Pdf2Swf and swftools from License notes, pom files, admin ui,
        admin ui English property values (translations still exist) and some obvious unit tests.
      - Note: SWFTransformationOptions has been left as it is used in tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-16 14:05:07 +00:00
Bogdan Horje
005c9543f5 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:32:24 +00:00
Tom Page
b8d49e79a0 ACE-2671 Unit tests for QNameTypeEditor.
The QNameTypeEditor was migrated from RM to repo in r83388, but
at the time there were no unit tests. This closes the issue by
adding unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-11 16:32:31 +00:00
Alex Mukha
cdefbd2bf1 Merged 5.1.N (5.1.1) to HEAD (5.1)
116289 amukha: ACE-4513: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      116284 amukha: MNT-15091: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         116280 amukha: MNT-15090: Merged DEV to V4.2-BUG-FIX (4.2.6)
            115799: MNT-15075 : [Pentest 121015] ZIP extraction code execution
               Fix and test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-09 11:51:52 +00:00
Mark Rogers
7e546d5ba0 ACE-4523 - Binary File mimetype is set to files edited via CIFS/FTP
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-06 14:13:58 +00:00
Alan Davis
0ccc05a0c6 Merged 5.1.N (5.1.1) to HEAD (5.1)
113251 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113194 abalmus: Merged DEV to 5.0.N (5.0.3)
         113149: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
            - Fixed issue that caused ACE-4194


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-29 06:00:22 +00:00
Gethin James
410c24d2d1 Better Null handling, ACE-4246
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-22 15:29:30 +00:00
Gethin James
8d583ab498 Merge Sabre4 to HEAD
111084: Copied the log4j.properties from core. Added additional DEBUG


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111207 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:07:27 +00:00
Gethin James
5524d399d0 Merge Sabre4 to HEAD
111051: Adding additional test coverage to PersonService RA-525


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:50 +00:00
Gethin James
a5f79d69f5 Merge Sabre4 to HEAD
111027: Added a log4j.properties for the repo tests. Primarily to exercise code in ActionServiceImpl which is debug only RA-507


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:36 +00:00
Alex Mukha
f7b86ad94b Merged DEV to HEAD (5.1)
110000: MNT-13836: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Changed class policies enabled/disabled checks. Now each behaviour at a given level must be explicitly disabled & re-enabled (unless all behaviours are disabled in the transaction).
      - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-14 09:16:26 +00:00
Alan Davis
1458c2dbcf Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108207: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108196: Merged DEV to 5.0.N (5.0.3)
         108195: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
            - New and improved fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-14 07:03:41 +00:00
Alan Davis
62d972f622 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108044: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107731: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107679: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Use the database to check if model is in use, rather than Search
         Fix up existing tests in light of these changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:29 +00:00
Alan Davis
3fd4104605 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108042: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107695: Merged NESS/5.0.N-2015_06_24 (5.0.2) to 5.0.N (5.0.3)
         107402: MNT-14275 - fixed the case where a Location with no path was provided when importing using UUID update
            - added a test case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108073 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:10:59 +00:00
Alan Davis
11ad4a1073 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106849: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106846: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         106845: MNT-14240 Emailed Aspect does not have user friendly property labels
            - Fix build again


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-23 16:27:54 +00:00
Tatyana Valkevych
04916eb008 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103946: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103861: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103837: MNT-13867: Merged V4.1-BUG-FIX to V4.2-BUG-FIX (4.2.5).
            101406: MNT-12454: Deletion behaviour of LDAP user does NOT work as documented.
                       - was added synchronization.syncDelete property.
            101558: MNT-12454: Deletion behaviour of LDAP user does NOT work as documented.
                       - If allowDeletions=true then authority need move to AuthorityService.ZONE_AUTH_ALFRESCO. ChainingUserRegistrySynchronizerTest.testForcedUpdateWithoutDeletions test was corrected. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-12 15:32:27 +00:00
Alan Davis
7078474695 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102708: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102489: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102284: Merged DEV to V4.2-BUG-FIX
            101812 : MNT-13710 : User cannot change site role if its current role contains an underscore
               - Added new unit test. Corrected some code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:17:53 +00:00
Alan Davis
9e3ae9c8e4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99376: BENCH-371: BM-0004: Copy Alfresco and set up build plan
    - Modify FileContentStore to service 'spoof://' URLs
    - SpoofedTextContentReader to generate consistent text for URL
    - Fix FileContentStoreTest so that tests actually execute
    - Add override for @After so that no NPEs are thrown
    - Add tests for the 'spoof://' protocol
    - Some additional checks for IllegalArgumentException on SpoofedTextContentReader construction
    - Force delete of 'spoof' to return false but not fail with an exception
      This is handled neatly by the EagerContentStoreCleaner, which accepts that the stores may protect data according to their own needs e.g. Centera
    - Add spoofing option to FileFolderPerformanceTester
      290 files/s for 1K files vs 460 files/s for spoofed text files (no binary streaming required)
    - Start FileFolderLoader component that will be used by the API  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:35:57 +00:00
Alan Davis
f1ebfb963f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
            93552 :Merged DEV to V4.2.3 (4.2.3.16)
               93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
                  - Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:29:20 +00:00
Alan Davis
b8709f0961 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
89429: ACE-2649: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      89386: Merged DEV to 4.2-BUG-FIX (4.2.4)
         85587: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
            - Keep original name during convertion.
            - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94626 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:40:19 +00:00
Alan Davis
c5a524e616 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
88169: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      87959: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.4)
         87891: MNT-12367 : Relaxed mode for mandatory association not possible
         Added support for relaxed mode of mandatory association target.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:58:45 +00:00
Alan Davis
16b6069313 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85620: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85550: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         85485: Merged DEV to V4.1-BUG-FIX
          85473 : MNT-10070 : Provide audit filter capabilities for audit applications.
           Added unit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:32:33 +00:00
Matt Ward
d9c11a7ca7 Merged BRANCHES/DEV/mward/head_cachestats to HEAD:
89575: ACE-3327: Work In Progress. TX cache statistics.
   89642: ACE-3327: Exposes statistics through JMX. Adds hit ratio.
   89649: ACE-3327: Added "@since 5.0" to new classes.
   89691: ACE-3327: improved TransactionalCache stats tests.
   89743: ACE-3327: fixed lack of thread safety for InMemoryCacheStatistics.
   89752: ACE-3327: now possible to disable/enable tx cache statistics per-cache with properties.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-03 18:08:50 +00:00
Jamal Kaabi-Mofrad
9b4a83ac2d Added UNIT tests for the SpellCheckDecisionManager class.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-17 12:53:48 +00:00
Jamal Kaabi-Mofrad
37309f11d7 Removed "cm:description" facet from the default filters.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87669 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-09 12:19:30 +00:00
Neil McErlean
5f1cbea5e3 Fix for ACE-3031. Quick test files should be part of the product.
The solution here was to move the various 'quick' files from test-resources into config.
I also needed to refactor the TransformerDebug class (called by the MBean operation) so that
it dealt with URLs of quick files rather than java.io.Files of quickfiles.
The various quick resources are available as entried in the repository jar file rather than being actual files on the filesystem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-06 14:56:23 +00:00
Jamal Kaabi-Mofrad
fc8c649191 - Refactored facet display handlers
- Changed date buckets implementation to use Solr Date math
- Added Site title display handler as well as a test for it
- Reverted back Neil’s work to inject the "special" facet IDs (SITE, TAG etc) from the solr-facets-context.xml as I re-wrote the SolrFacetHelper class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 21:14:26 +00:00
Mark Rogers
85f1e5b819 Merged DEV to HEAD : 54690, 54691 : ACE-2783 - Opening and closing a *.xls and *.ppt files with the CIFS interface(without saving) creates a new version
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:08:15 +00:00
Mark Rogers
45c31e0fe9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84760: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80304: Build fix: ACE-2428   SOLR 4 - DD facetable & tidy up doc value support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:29:21 +00:00
Alan Davis
7030eb0a29 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84255: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84254: Reverse Merge V4.2-BUG-FIX (4.2.4)
         << Causes problems for other transformations such as those that start with an HTML file >>
         77398: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
          - Keep original name during convertion.
          - Add unit testMNT-11279: Docx Preview: FileName in the document header not previewing correctly
          - Keep original name during convertion.
          - Add unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:32:35 +00:00
Alan Davis
862e07f3e2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84058: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83799: MNT-12238: Merged DEV 4.2-BUG-FIX (4.2.4) to V4.2-BUG-FIX (4.2.4)
         MNT-12238: Merged 4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
            80291: Merged V4.1.6 (4.1.6.21) to V4.1-BUG-FIX (4.1.10)
               77378: Merged DEV PATCHES/V4.1.6 (19) to PATCHES/V4.1.6 (20)
                  76649: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     - Patch from MNT-577 has been combined with new changes to avoid hanging of analyzing complicated PPTX documents. The fix just disables reading the entire contents of the complicated document. POI metadata extractor may be switched to standard behavior or reconfigured, using the following new properties: content.transformer.Poi.poiFootnotesLimit, content.transformer.Poi.poiExtractPropertiesOnly and content-services-context.xml/extracter.Poi/poiAllowableXslfRelationshipTypes
                  77379: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     Test and the test data for MNT-577 have been added. Test for MNT-11823 has also been added. But this test is commented because the test data (appropriate PPTX document) is not currently available. Getters for POI specific properties have been added to 'PoiMetadataExtracter' for tests. Also 'afterPropertiesSet()' logic has been a bit modified to allow setting 'false' value for 'poiExtractPropertiesOnly' parameter
                  77561: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     Fix for https://bamboo.alfresco.com/bamboo/browse/HF-PATCH416-126 build failure. POI extractor and transformer properties of 'AlfrescoPoiPatchUtils' have been isolated from each other using context. Each extractor or transformer now has its own context or uses the default context. Properties of the default context allow parsing the entire contents of XLSF documents. And footnotes limit is 50. Property names have not been changed, but currently 'content-services-context.xml/extracter.Poi/poiAllowableXslfRelationshipTypes=null' does not lead to 'content.transformer.Poi.poiExtractPropertiesOnly=false'. I. e., this list may be empty. 'PoiMetadataExtracterTest' test has been modified in accordance with the introduced changes. 'poi-OOXML-3.9-beta1-20121109.jar' has been renamed to 'poi-OOXML-3.9-beta1-20121109-patched.jar'
                  79180: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     Timeout mechanism has been added to content transformers. Timeout configuration options have been added. Also mechanism to close streams after 'TimoutException' has been added to transformers and metadata extractors. Also timeout mechanism for input streams has been enabled in 'TikaPoweredContentTransformer'
                  79268: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     Fix for the https://bamboo.alfresco.com/bamboo/browse/HF-PATCH416-133 build failure and comments of the review https://fisheye.alfresco.com/cru/CR-100#CFR-1184. The new test has been added into 'PoiOOXMLContentTransformerTest.testMnt12043()' to check out the newly added timeout mechanism
                  79290: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     - Removed methods and properties that are no longer needed
                  79327: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     - Increased ADDITIONAL_PROCESSING_TIME to 1500ms to try and avoid a new intermittent test failure.
      83885: MNT-12238 Bring Maven POM file in sync with latest patched version of poi-ooxml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:23:49 +00:00
Alan Davis
fa4d74fa5b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84033: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83385: MNT-12297: TransactionalCache equality checks lead to false negatives in a cluster
       - TransactionalCache uses ValueHolder to store values put into the cache.
       - Each ValueHolder will have a new random integer to distinguish it from the next
       - TransactionalCache equality checks no longer use reference equality and instead
         use the ValueHolder.equals() method for most cases.  This actual client value
         .equals() is used where 'allowEquals' is true.
       - Immutable caches always assume the backing cache is correct, still.
      83391: Fix test doing checks in low-level cache (r83385 MNT-12297)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:21:11 +00:00
Will Abson
a740ca67cb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80669: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78166: ACE-1582: Enhancements to the facet service to persist only the modified value(s) rather than the whole facet's properties. Also fixed facets cache and facets reordering NPE.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:18:39 +00:00
Will Abson
c717551907 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79326: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      79090: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removed references to http://www.jcp.org/jcr (left in web-scripts-application-context.xml
           and multiple versions of opencmis-gnamefilter-context.xml)
      78990: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removing references to "jcr-xpath" - Biggest changes were to: DocumentNavigator, NodeServiceXPath and NodeSearcher
         - SearcherComponentTest has a lot of tests removed that appeared to be JCR specific
         - There are still a lot of namespace references in XML files to http://www.jcp.org/jcr/1.0 etc.
         - Left a few  references to "JSR 170" and JCR in java classes as they looked like they might be common with other bits.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:21:53 +00:00
Erik Winlof
08501d9b8e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78913: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78866: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         78729: MNT-9257: Incorrect behaviour with password protected MS office documents
         Check if failover transformers support transformation for mimetype before calling it. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 13:21:27 +00:00
Erik Winlof
b4ca4268d7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78747: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78624: Merged V4.2.1 (4.2.1.10) to V4.2-BUG-FIX (4.2.4)
         77969: MNT-11926: Unable to start a workflow from a taskListener
         When activity workflow is started suspend CommandContext propogation (if any exists) so that new ProcessInstance could be flushed and correctly converted to WorkflowPath. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:53:48 +00:00
Erik Winlof
87085fafda Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78561: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77720: Merged DEV to V4.2-BUG-FIX (4.2.4)
         57817: MNT-7383: ActionFormProcessor not capable of handling multi-valued parameters, empty optional parameters and paramater types other than TEXT, BOOLEAN or NODE_REF
         The hard limitation to TEXT, BOOLEAN and NODE_REF fields was relaxed to make use of default controls in the Share UI.
         Added unit test.
      78164: MNT-7383 : ActionFormProcessor not capable of handling multi-valued parameters, empty optional parameters and paramater types other than TEXT, BOOLEAN or NODE_REF
      Reimplemented missing test configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:34:03 +00:00
Erik Winlof
e429be8b8c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78537: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77398: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
       - Keep original name during convertion.
       - Add unit testMNT-11279: Docx Preview: FileName in the document header not previewing correctly
       - Keep original name during convertion.
       - Add unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:29:43 +00:00
Erik Winlof
3f5242db68 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78519: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78398: ACE-81 Upgrade MyBatis to 3.2.7
         - myBatis 3.2.7 upgrade onto Spring 3.2 upgrade. Merged in appropriate sections from BRANCHES/DEV/DEREK/ALF-19099 and fixed
         - myBatis namespace config issue. Full maven build with unit tests works, repo and share start and the basics seem to be working.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:25:40 +00:00
Erik Winlof
f4e6466c93 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78501: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76817: MNT-11756: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76808: MNT-11756: Associated nodes deleted when reverting to older version.
            - Keep secondary association during revert if versioned and current node have child association with the same node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:20:51 +00:00
Erik Winlof
e94f8f8351 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:13:50 +00:00
Mark Rogers
a576035f0f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77150: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73977: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:02:04 +00:00
Mark Rogers
fb29bcf312 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76603: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0BF)
      75807 : Merged DEV to V4.2-BUG-FIX (4.2.3)
         75768 : MNT-11304 : Type definition response for exif aspect using browser binding is causing some JSON parsers to fail
            - Use default boundaries only for numeric types
         75778 : MNT-11304 : Type definition response for exif aspect using browser binding is causing some JSON parsers to fail 
            - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:05:18 +00:00
Mark Rogers
ded1d1a971 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76588: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76507: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         76354: MNT-11247 : Additional assignment events triggered at end of workflow
         Added a test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:55:05 +00:00
Mark Rogers
ff54603c84 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76307: Merged EOL2 (5.0.0.EOL2) to HEAD-BUG-FIX (5.0/Cloud)
      76117: Fix build - remove references to CXF context in subsystem-test-context.xml since removal of WS API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 14:48:34 +00:00
Mark Rogers
ebf8652ebb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75759: Reverse Merge HEAD-BUG-FIX (5.0)
      74605 : Reverse Merge HEAD-BUG-FIX (5.0)
         << Caused 1 build error https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD0-384 >>
         74567 : Merged DEV to HEAD-BUG-FIX (5.0)
            69634 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
               - TYPE_BASE is valid CMIS type
            73710 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
               - Create association between cmis:document and cmis:item test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:49:11 +00:00
Will Abson
54c2fa7c42 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75050: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72319: Various hacks to get around issues with the ant system-build-test classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:12:42 +00:00
Will Abson
f4f3bdd860 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75030: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71714: Added a event publishing test to WebDAVHelper


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:04 +00:00
Will Abson
2fd7b9b7c5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74605: Reverse Merge HEAD-BUG-FIX (5.0)
      << Caused 1 build error https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD0-384 >>
      74567 : Merged DEV to HEAD-BUG-FIX (5.0)
         69634 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
            - TYPE_BASE is valid CMIS type
         73710 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
            - Create association between cmis:document and cmis:item test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:39:07 +00:00