Commit Graph

137 Commits

Author SHA1 Message Date
Alan Davis
d65016321b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100869: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100839: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100838: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100835: MNT-13752: LinksRestApiTest fails during Summer
               - Fix for the build failure. Use the same ISO8601DateFormat to compare values.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:22:08 +00:00
Alan Davis
6ae2064bfe Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
9034d57c09 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99691: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99496: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99400: Merged DEV to V4.2-BUG-FIX (4.2.5)
            99360 : MNT-13234 : Duplicate activities in activities feed
               - Added check for avoid duplicate activities
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:52:23 +00:00
Alan Davis
cfa04ebc70 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99377: BENCH-369: BM-0004: API and internals for Alfresco server
    - Move commons Math3 to 'core' project for general reuse
    - Clone NormalDistributionHelper class from Benchmark projects to Alfresco 'core'
    - API added: http://localhost:8080/alfresco/s/api/model/filefolder/load
      JSON:
      {
      "folderPath":"/Sites/t2/documentLibrary",
      "fileCount":"1",
      "minFileSize":"1024",
      "maxFileSize":"2048",
      "maxUniqueDocuments":"10000"
      }
    - Above JSON will create 1 file in the 't2' site document library with spoofed plain text
    - Change away from deprecated API for TransactionListenerAdapter
    - Fix imports and neatness
    - Improve FileNotFoundException details
    - Disable timestamp propagation on the parent folder to reduce CPU overhead
    - Document changes relating to the addition of cm:description properties
    - Add options to control generation of MLText cm:description fields
      - descriptionCount: number of cm:description translations to include
      - descriptionSize:  size in bytes of each cm:description translation
    - Use released 'alfresco-text-gen' V1.1
    - Use fixed text-gen component to prevent ArrayIndexOutOfBOunds
    - Tighten up error message when errors occur on reading content strings
    - Fix random seed generation bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99503 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:36:33 +00:00
Alan Davis
58d58b2479 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98968: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98792: Merged NESS/5.0.N-2015_03_04 (5.0.2) to 5.0.N (5.0.2)
         98764: MNT-13364: Failing tests on DB2: QuickShareRestApiTest, SiteServiceTest, GetMethodRegressionTest
            - fixed tests in QuickShareRestApiTest, SiteServiceTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 08:08:06 +00:00
Alan Davis
0dd0c87f93 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98426: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98384: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98286: MNT-13473: Merged CLOUD39 (Cloud 39.3) to 5.0.1 (5.0.1)
            97951: MNT-13456:


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98533 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:43:09 +00:00
Alan Davis
d0f7fdedf7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98425: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98374: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98372: Merged CLOUD39 (Cloud39.3) to 5.0.1 (5.0.1)
            98353: MNT-13456:


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98532 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:42:32 +00:00
Alan Davis
fb3f359b79 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98422: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98303: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98253: Fix for     MNT-13503    Solr throws exceptions when activating and then deactivating a model
         - also fixed running embedded tests
         98263: Fix for     MNT-13503    Solr throws exceptions when activating and then deactivating a model
         - fix failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98529 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:41:02 +00:00
Alan Davis
7aacfc700c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98074: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97985: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97827: Merged DEV to V4.2-BUG-FIX
          97818: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Corrected junit tests. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-26 07:47:08 +00:00
Alan Davis
7802d4d1dc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98073: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97984: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97763: Merged DEV to V4.2-BUG-FIX
          96388: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Detect "AlfrescoLockKeeperImpl" and then create new LockInfo object. 
          97572: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Added marker for webdav lock. Added new junit test.
          97725: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Corrected some code. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-26 07:46:57 +00:00
Alan Davis
625288ed18 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97695: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97685: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97573: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            97499: MNT-13194: GetMethodRegressionTest takes from 20 seconds to 4 hours depending on database
               - Fixed the test cleanup.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-21 07:53:33 +00:00
Alan Davis
05ad9c59e4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96863: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96770: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         96760: Merged DEV to 5.0.1 (5.0.1)
            96635: MNT-13310 : Failing test: PublishingRestApiTest testPublishingQueuePost
               - IN_PROGRESS and COMPLETED statuses are added to expected list to take into account slow environments


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-12 09:59:36 +00:00
Alan Davis
65514834c1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96603: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96403: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         96402: Merged 5.0.0 (5.0.0.6) to 5.0.1 (5.0.1)
            96290: MNT-13291 : [Security] XSS in /ModuleDeployment
               - Escape url.service in html.status.ftl
            96295: MNT-13291 : [Security] XSS in /ModuleDeployment
               - Added XssVulnerabilityEnterpriseTest to enterprise-remote-api
            96364: MNT-13291 : [Security] XSS in /ModuleDeployment
               - Escape args.authenticatorName to avoid XSS
            96365: MNT-13291 : [Security] XSS in /ModuleDeployment
               - Escape args.authenticatorName in enterprise webscripts. Use js_string to encode JavaScript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-10 13:19:10 +00:00
Alan Davis
82126fa6f0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96473: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96360: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96323: Reverse Merge V4.2-BUG-FIX (4.2.5)
            << Reverted as build has been broken for 4 days >>
            95704: Merged DEV to V4.2-BUG-FIX (4.2.5)
               94398: MNT-13234 : Duplicate activities in activities feed
                  - Changed getFollowers() method with implementing username case sensitive specific, like it done in getSiteMembers() method.
               94483: MNT-13234: Duplicate activities in activities feed
                  - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:52 +00:00
Alan Davis
7a008c3eb7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96472: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96359: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96305: MNT-13212: Merged DEV to V4.2-BUG-FIX (4.2.5)
            96032: MNT-13212: Details of tasks assigned to any user are visible to all users via API call
               - Restore workflow permission check in interceptor for getAssignedTasks and getPooledTasks methods. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:43 +00:00
Alan Davis
3b7e58c86a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96471: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96358: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         95704: Merged DEV to V4.2-BUG-FIX (4.2.5)
            94398: MNT-13234 : Duplicate activities in activities feed
               - Changed getFollowers() method with implementing username case sensitive specific, like it done in getSiteMembers() method.
            94483: MNT-13234: Duplicate activities in activities feed
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:33 +00:00
Alan Davis
010ba4a86c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96317: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      96272: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         96106: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            96045: Merged DEV to V4.1-BUG-FIX (4.1.10)
               94227 : MNT-12569: Problems with org/alfresco/repository/thumbnail scripts
                  - Added a test
               94339 : MNT-12569: Problems with org/alfresco/repository/thumbnail scripts
                  - Implemented 'PUT' method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:29:39 +00:00
Alan Davis
7e1f737e7e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93834: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93734: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         - SOURCE/root/projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/collaboration/calendar.get.html.ftl
           was removed from 5.0 as part of an EOL activity
         93559: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            93544: Merged DEV to V4.2.4 (4.2.4)
               93482: MNT-13174: /share/service/components/form {htmlid} unsanitized: XSS vulnerability
                - Add html escape to avoid XSS vulnerability 
            93545: Merged DEV to V4.2.4 (4.2.4)
               93508 : MNT-13177 : /alfresco/wcservice/search/keyword {l} unsanitized: XSS vulnerability 
                  - Escape search.localeId property
            93549: Merged DEV to V4.2.4 (4.2.4)
               93540 : MNT-13173 : /share/service/components/form {destination} unsanitized: XSS vulnerability
                  - Add html escape to avoid XSS vulnerability
            93555: Merged DEV to V4.2.4 (4.2.4)
               93476: MNT-13178: /alfresco/wcservice/api/search/person {l} unsanitized: XSS vulnerability
                  - Add url escape to avoid XSS vulnerability
            93556: Merged DEV to V4.2.4 (4.2.4)
               93477: MNT-13176 : /alfresco/wcservice/collaboration/calendar {nodeRef} unsanitized: XSS vulnerability
                  - Added ?html built-in processing for nodeRef argument. 
         93718: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            93671: Merged DEV to PATCHES/V4.2.4 (4.2.4)
               93661: MNT-13180: go through all API URI and confirm all parameters are sanitized
                  - Add unit test that checks all webscripts for sanitized parameters
            93672: MNT-13190: /alfresco/wcservice/sample/blog/search {q} unsanitized: XSS vulnerability
               Add html escape to fix XSS vulnerability
            93691: MNT-13190: /alfresco/wcservice/sample/blog/search {q} unsanitized: XSS vulnerability
               Patch imported blogsearch template


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:22:44 +00:00
Alan Davis
586807e319 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93371: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93309: MNT-12794: Merged dev. 5.0.N (5.0.1) to 5.0.N (5.0.1)
          92772: MNT-12794: [Security] Information leak via verbose eror messages
              - Not public exceptions have been transformed into a configurable parameter. The basic configuration has been moved to .web-scripts-application-context.xml.. A safe choice for the name of the parent bean in the context of enterprise tests was put into the .enterprise-web-scripts-application-context.xml.. to ensure that the Cloud tests will work well without not public exceptions configuration. All tests related to the not public exceptions are implemented in .org.alfresco.repo.web.scripts.RepositoryContainerTest.. << N. B.: This revision does not contain changes for Cloud >>


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:21:40 +00:00
Alan Davis
ca7800351f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93264: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93239: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93194: MNT-12991 : Disabled users can be invited in site
            - Resolved build failures, corrected tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:20:12 +00:00
Alan Davis
c2cefdabfa Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93248: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93130: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93124: Merged DEV to V4.2-BUG-FIX (4.2.5)
            92705 : MNT-12991 : Disabled users can be invited in site
               - Added check for disabled user
               - Added unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:14:38 +00:00
Alan Davis
cfb92ca02b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92755: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92746: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         92700: MNT-13026: JDK8: 5 test failures in remote-api
         Fixed tests to check JSON correctly as in JDK8 the objects have different order.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:05:28 +00:00
Alan Davis
a35aee7b1e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91788: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91682: Merged 5.0.0 (5.0.0.1) to 5.0.N (5.0.1)
         91617: MNT-12879: Cannot preview or download document with explicit permissions
         Disabled activity generation for file downloads from a private site if the user is not a member of the site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:39:15 +00:00
Alan Davis
fc1a9c75ad Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90946: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90874: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.5)
         90590: MNT-12281 : Cannot set CSV delimiter in DeclarativeSpreadsheetWebScript
         Added CSV delimiter as a request parameter to the DeclarativeSpreadsheetWebScript implementations 
         Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94749 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:08:31 +00:00
Alan Davis
1f11c927f3 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90799: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      << Test was using old api that has been removed >>
      90760: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
         90379: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.4)
            90266: MNT-9342: Calling custom actions having properties declared as « multiple » from WebServices does not work.
            Added JUnit test to simulate the issue.
         90438: MNT-9342: Calling custom actions having properties declared as « multiple » from WebServices does not work.
         Fixed merge mistake for the test in r90379.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:02:23 +00:00
Alan Davis
a5bc540d32 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90760: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90379: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.4)
         90266: MNT-9342: Calling custom actions having properties declared as « multiple » from WebServices does not work.
         Added JUnit test to simulate the issue.
      90438: MNT-9342: Calling custom actions having properties declared as « multiple » from WebServices does not work.
      Fixed merge mistake for the test in r90379.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:59:13 +00:00
Alan Davis
47e7e002a1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
88003: Merged DEV to HEAD-BUG-FIX (5.0.1)
      85764: ACE-1925 : Intra-Wiki links to pages with umlaut characters are not shown as existing - Added to unescapeHtml title Wiki page.
      87724: ACE-1925 : Intra-Wiki links to pages with umlaut characters are not shown as existing
         - Added unit test xss injections. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:50:16 +00:00
Alan Davis
470c277613 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
87777: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      87727: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.4)
         82329: MNT-11909 : Folder created from template has incorrect primary path or name
         Fixed the webscript to use setName instead of directly modifying the name property.
         Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:49:24 +00:00
Alan Davis
e1370e02cd Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
87701: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      86502: Merged DEV to V4.2-BUG-FIX (4.2.4)
         86291: MNT-12303 : Renaming a folder containing a document that is locked due to online editing causes a duplicate folder and file with no content to be created
            - Refresh lock request should not create new empty resource.
            - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:47:13 +00:00
Neil McErlean
5d1fc74367 Further fix for ACE-2932 to allow the UI to post pseudo-qname strings like "Site" or "Tag".
Without this fix, strings with no leading "{}" are rejected as not being recognised as QNames.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 15:21:08 +00:00
Neil McErlean
e2dded6a18 Fix for issue blocking ACE-2932. This checkin means that the SolrFacetConfigAdmin{Post,Put} webscripts will accept both long and short-form qname strings.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 11:42:55 +00:00
Neil McErlean
b30924a0e7 Build fix. Fixing failing tests in FacetRestApiTest. Switching to use of short-form qnames.
Will add tolerance for long-form qnames later.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-24 14:02:00 +00:00
Alan Davis
a7766b82d9 ACE-936: Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85515: Merged DEV to HEAD-BUG-FIX (5.0/Cloud).
      63635: ALF-20865 Consumers should not be able to share/unshare a document
                Unshare action can perform consumer/contributer who performed Share action or a user with another role.
      84859: ACE-936 Consumers should not be able to share/unshare a document
                In QuickShareRestApiTest was added testUnshareContributer() test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85533 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:11:26 +00:00
Mark Rogers
bd2fec4451 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84947: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83651: Fixed the build failure. Missed to commit the updated test related to ACE-2640.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85264 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:23:16 +00:00
Mark Rogers
05c1bb9d58 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84925: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83487: Build fix. Related to ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:12:34 +00:00
Mark Rogers
be04629fec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84902: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83412: Preliminary implementation of ACE-2639.
      This check-in allows any user to hit the repo at http://localhost:8080/alfresco/service/api/facet/facetable-properties
      or at http://localhost:8080/alfresco/service/api/facet/classes/cm:thumbnail/facetable-properties and get details on facetable properties for all properties in the system or all properties on the specified type/aspect, respectively.
      I'm checking this in in order to start to get some feedback on what the global list contains and how we might restrict it. The JSON response is very basic currently and it will be enhanced also.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:02:07 +00:00
Alan Davis
c790f41a15 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84349: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84240: MNT-12407/MNT-11511 : Reverse Merge V4.2-BUG-FIX (4.2.4)
         77501 : Merged DEV to V4.2-BUG-FIX (4.2.4)
            76291 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
               - Using tagscope api at search for tags quantity in repository


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:34:10 +00:00
Alan Davis
87ff3cd051 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84345: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      << About to revert HBF 78551 so need to revert this first >>
      79277: Merged DEV to HEAD-BUG-FIX
         79272 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
            - Fixed failures on V5.0


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:33:53 +00:00
Alan Davis
d3d687797f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84121: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82508: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82319: Merged DEV to V4.1-BUG-FIX (4.1.10)
            81073 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Initial commit to revert fixes for MNT-8527 (r48757) and MNT-9483 (r56137) as this fixes causes performance issue for Oracle.
            81966 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Default value for feed_user_id and site_network is now @@NULL@@.
               - IS NULL clause was completly removed from activities queries.
               - Upgrade sql script was added to replace nulls for Oracle (empty strings for other dialect) with @@NULL@@.
               - Version schema was incremented by 1.
            82278 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Fixed unit test failure. 
      83431: MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
         - Fixed build failure
      84115: MNT-9532/MNT-11871: with the revert of MNT-11871 patch, MNT-9532 should be using a lower schema number.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:26:23 +00:00
Alan Davis
bff1e27004 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84047: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83804: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         83716: MNT-11355: Merged DEV to V4.1-BUG-FIX (4.1.10)
            83675: MNT-11355: PostSubParamInjection and HeaderParamManipulation attacks identified by HP Web Inspect
               - Hide SQLException from stacktrace that is sent in error response to client. Add unit test.
         -----------------------------------------------
         M /alfresco/BRANCHES/DEV/V4.1-BUG-FIX
         M /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/core/source/java/org/alfresco/error/AlfrescoRuntimeException.java
         M /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
         M /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/remote-api/source/test-java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:21:26 +00:00
Alan Davis
3483a48613 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83946: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82505: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82276: Merged DEV to V4.1-BUG-FIX (4.1.10)
            80919: MNT-8614 : Working Copy can be open by another user locking the file
            Implemented a test to simulate the issue.
      82506: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82300: MNT-8614 : Working Copy can be open by another user locking the file
         Fixed WebDAVonContentUpdateTest, which referenced an old davLockInfo.xml.
      83433: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         83432: MNT-8614 : Working Copy can be open by another user locking the file
         Removed unnecessary locking in the test, which causes fail on V4.2-BUG-FIX.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:17:50 +00:00
Alan Davis
7fe1374edb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83943: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82504: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         81668: Merged DEV to V4.1-BUG-FIX (4.1.10)
            80985 : MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
               - Fixed the issue. Implemented a test to simulate the issue.
      82513: Fix build failure after:
         Merged DEV to V4.1-BUG-FIX (4.1.10)
            80985 : MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
               - Fixed the issue. Implemented a test to simulate the issue.
      83418: Add further hacks to the CommentsApiTest, which needs to be refactored to use RetryingTransactionHelper.
      83679: MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
         - Fixed build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:17:42 +00:00
Alan Davis
caf361cd61 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83541: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82261: Merged DEV to V4.2-BUG-FIX (4.2.4)
         80345 : MNT-11990 : vti sharepoint server does not respect If: HTTP headers as defined in rfc2518
            - LockMethod was corrected to prevent lock refresh for non-locked files.
            - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:08:49 +00:00
Erik Winlof
7954be61aa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82375: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76480: Re-worked download activity posting following Kev's changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:50:52 +00:00
Erik Winlof
3071b55a6a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82371: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76477: Removed the Raise Browser Event logic on webpreview. No longer required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:49:39 +00:00
Will Abson
72f0e836a4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80736: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78923: ACE-2370: Changed facet config web-scripts URL from /api/solr/facet-config TO /api/facet/facet-config to fix the facets retrieval when Solr SSL is enabled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:46:01 +00:00
Will Abson
5bb3de7195 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80729: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78874: Added tests for facet config rest api (Cloud). Part of ACE-1582


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83027 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:44:52 +00:00
Will Abson
ffb416a5f8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80709: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78667: ACE-1582: Made the facet config service and the relevant web scripts to accept single/multiple value(s) update (to support inline edits).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:41:45 +00:00
Will Abson
cde57422fc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80701: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78593: First attempt at fixing FacetRestApiTest to run in bamboo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:31:22 +00:00
Will Abson
dcb3bc2934 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80698: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78457: ACE-1582: - Fixed facet's custom properties.
                - Made the GET facets web-script to be accessed by all authenticated users rather than just the Search-Admin/Network-Admin users. 
                - Fixed FacetRestApiTests and added more tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:30:54 +00:00