Commit Graph

153 Commits

Author SHA1 Message Date
Tatyana Valkevych
ac0c8cc13f Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud) (PARTIAL MERGE)
109176: MNT-3053 : User can see page with information about all events (they are entitled to see) on all sites, if they use an incorrect url.
      - UserCalendarEntriesGet.java now returns 404 status code of requested site doesn't exist.
      - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-30 09:49:52 +00:00
Mark Rogers
84dee76915 Merge WOLF-1 to HEAD
108132: UTF-30 Fix version of share, built in Share codebase
Fix version of share-po, built in Share codebase
108130: UTF-30 Fix version of artifacts built in Share codebase + package alfresco-platform and share-services AMP instead of share-enabled alfresco war
108128: UTF-30 Fix version of artifacts built in Share codebase + package alfresco-platform and share-services AMP instead of share-enabled alfresco war

107846: EOL-10: Remove JBPM bootstrap.

Removed the JBPM boostrap bean ("workflowScheduler") and the schema validation from bootstrap-context.xml
107842: EOL-4 : Remove JBPM schema bootstrap reference.
107839: EOL-8 : Remove JBPMWorkflowTestSuite and re-instate InviteServiceTest
107823: Temp remove InviteServiceTest
107820: EOL-9: Remove workflow definitions for JBPM workflows
107813: EOL-6: Remove jBPM from MBeans
SVN ignore settings
107810: EOL-8 : Attempt to update Invite service test to use activity.
107794:EOL-5: Remove jBPM from Admin Console
107790: EOL-8 : Remove JBPM Tests
EOL-8 : more JBPM tests removed.
EOL-8 : Remove JBPM tests from Workflow Test Suite
EOL-8 : Remove JBPMEngineTest
AIRWOLF - more enterprise pom work.
UTF-143 - add the update tool JAR to the enterprise distribution.
Airwolf - need to separate dependency.share.version
EOL-8 - Remove system.workflow.engine.jbpm.enabled

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-21 12:18:23 +00:00
Alan Davis
7b549b1768 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
Tatyana Valkevych
22d2935235 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Alan Davis
e18c35db17 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107013: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106982: MNT-14113: User admin console: sorting users causes some to disappear
      Additional changes in 'org.alfresco.repo.web.scripts.invite.InviteServiceTest' to fix the https://bamboo.alfresco.com/bamboo/browse/ALF-ENT50-346 test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107052 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-25 08:28:36 +00:00
Tatyana Valkevych
83649658c3 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101748: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101637: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101337: Merged DEV to V4.2-BUG-FIX
         100314 : MNT-13144 : WebDav does not correctly version CAD drawings correctly when saved using Windows mapped drive
          Corrected shuffle pattern and some code for dwg files. 
         101140 : MNT-13144 : WebDav does not correctly version CAD drawings correctly when saved using Windows mapped drive
          Was corrected some code for move webdav method. Added new junit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-14 16:12:25 +00:00
Tatyana Valkevych
f5f40192fa Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101335: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100788: Fix LinksRestApiTest so that it is comapring two time-zone independent Date objects instead of strings with (potentially) different timezones.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:26:06 +00:00
Tatyana Valkevych
1b72cf11d5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101325: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100313: RA-62: moved AdvancedSearchTest to share-services project.
      Have also marked it @Ignore, since:
      - it doesn't pass when I run this manually on HEAD-BUG-FIX
      - it isn't included in a TestSuite there so doesn't get run on bamboo anyway
      - the test would get run in share-services, as we don't require suites there for a test to get run


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:18:46 +00:00
Tatyana Valkevych
b45f81630a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101324: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100298: RA-62: fixed main code base to include ReadOnlyTransactionInGetRestApiTest class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:18:23 +00:00
Tatyana Valkevych
6c1522a93a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101323: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100294: RA-62: split ReadOnlyTransactionInGetRestApiTest into /api and /slingshot tests.
      The /slingshot tests have moved into the share-services project.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:17:58 +00:00
Tatyana Valkevych
eae3ca6373 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101322: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100284: RA-62: move PermissionServiceTest to share-services project.
      This test was not being run previously, since it was not included in a suite.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:17:07 +00:00
Tatyana Valkevych
902ec85fce Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101321: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100282: RA-62: moved WikiRestApiTest to share-services project.
      This test was not being run previously as it was not included in a suite.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:16:17 +00:00
Tatyana Valkevych
8a30804066 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101319: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100048: RA-62: moves common webscript tests to repo, fixes compilation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101461 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:15:25 +00:00
Tatyana Valkevych
256e874fdf Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101317: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100014: RA-62: Remove reference to FolderTemplateTest and SlingshotContentGetTest in test suite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:13:16 +00:00
Tatyana Valkevych
d047d67fb3 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101312: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      99983: RA-62: fix SiteServiceTest so that it uses FileFolderService for copy/move instead of /slingshot API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:10:03 +00:00
Tatyana Valkevych
74149ea9dd Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101311: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      99978: RA-62: fix QuickShareRestApiTest so that it doesn't use /slingshot API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101453 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:09:41 +00:00
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