Commit Graph

4344 Commits

Author SHA1 Message Date
Alan Davis
c0c08126d3 Merged 5.2.N (5.2.1) to HEAD (5.2)
131822 amukha: REPO-1260: Upgrade installer version of LibreOffice to 5.2.1
      - Upgraded libreoffice to 5.2.1, changed the checks to include libcairo2 and libgl1-mesa-glx


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:58:52 +00:00
Alan Davis
507e3f1c04 Merged 5.2.N (5.2.1) to HEAD (5.2)
131530 kroast: ACE-4881 - [Pentest 121015] Multiple admin CSRF
      - Fix issue spotted by Michael Suzuki, where the /s endpoint was not configured correctly to generate CSRF tokens


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132270 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:53:13 +00:00
Alan Davis
01156b23b5 Merged 5.2.N (5.2.1) to HEAD (5.2)
131485 kroast: Merged 5.2-DEV (5.2.0) to 5.2.N (5.2.N)
      131352 kroast: ACE-4881 - [Pentest 121015] Multiple admin CSRF
         - Added CSRF filter config to protect the Alfresco Admin Console pages


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:52:23 +00:00
Alan Davis
47ae44e500 Merged 5.2.N (5.2.1) to HEAD (5.2)
131370 adavis: Merged 5.2.N-SERVLET-3.0 (5.2.1) to 5.2.N (5.2.1)
      130708: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part I),
      130714: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)
      - fix web.xml (web-app),
      130727: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)
      - update other web.xml's (other than web-client project),
      130844: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
      - update to servlet-api 3.0.1,
      130847: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
      - follow-on to commit the correct pom.xml (ie. parent rather than overlay),
      130852: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
      - follow-on


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:50:08 +00:00
Alan Davis
00c391da60 Merged 5.2.N (5.2.1) to HEAD (5.2)
131286 amukha: Merged DEV to 5.2.N (5.2.1)
      131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
      131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - added patch to remove JBPM database tables
      131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - replaced generic DB script with database specific scripts
      131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - Fix DB2 patch
      131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - Fix JBPM table removal patch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:46:48 +00:00
Alan Davis
b4ed1d1fce Merged 5.2.N (5.2.1) to HEAD (5.2)
131286 amukha: Merged DEV to 5.2.N (5.2.1)
      131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
      131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - added patch to remove JBPM database tables
      131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - replaced generic DB script with database specific scripts
      131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - Fix DB2 patch
      131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - Fix JBPM table removal patch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:46:48 +00:00
Alan Davis
f0accf3768 Merged 5.2.N (5.2.1) to HEAD (5.2)
130784 amukha: REPO-1006: Move Alfresco 'data-model' to Git
      - removed project files
      - changed the dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:26:09 +00:00
Alan Davis
c0d09725bc Merged 5.2.N (5.2.1) to HEAD (5.2)
130784 amukha: REPO-1006: Move Alfresco 'data-model' to Git
      - removed project files
      - changed the dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:26:09 +00:00
Alan Davis
4c87e911b7 Merged 5.2.N (5.2.1) to HEAD (5.2)
130710 adavis: Merged 5.2.N-UPGRADES (5.2.1) to 5.2.N (5.2.1)
      130660: Merged 5.2-UPGRADES (5.2.1) to 5.2.N-UPGRADES (5.2.1)
         << Some things have moved forwards on 5.2.N so the original commits are not the same >>
            - AuthUsers upgraded to the same as 5.2.N (5.2.0.1 -> 5.2.0.3)
            - isoparser upgraded to the same as 5.2.N (1.0-RC-15 to 1.0.2)
         125130: ACE-4055 Revert upgrade of json to 20160212: it has incompatible changes,
         125114: BDE-624 First batch of 3rd party upgrades in enterprise projects
           jasypt 1.9.1 -> 1.9.2
           vaadin 6.8.8 -> 6.8.16,
         125015: BDE-624 First batch of 3rd party upgrades
          Spring Framework 3.2.14.RELEASE -> 3.2.16.RELEASE
          Jackson2 2.3.2 -> 2.7.3
          httpcomponents 4.5.1 -> 4.5.2
          mysql driver 5.1.35 -> 5.1.38
          postgresql driver 9.4-1201-jdbc41 -> 9.4.1208.jre7
          slf4j 1.7.12 -> 1.7.21
          json 20090211 -> 20160212
          joda-time 2.8.1 -> 2.9.3
          commons-compress 1.9 -> 1.11
          commons-net 3.3 -> 3.4
          commons-validator 1.4.1 -> 1.5.0
          axiom 1.2.15 -> 1.2.18
          jaxb 2.2.6 -> 2.2.7
          myfaces 1.1.8 -> 1.1.10
          h2 1.4.187 -> 1.4.191 
          browsermob 2.1.0-beta-1 -> 2.1.0-beta-5
          javax.mail 1.5.2 -> 1.5.5
          derby 10.11.1.1 -> 10.12.1.1
          wss4j 1.5.12 -> 1.6.19
          XmlSchema 1.4.5 -> 1.4.7
          xstream 1.2.2 -> 1.3.1
          geronimo-ws-metadata_2.0_spec 1.1.2 -> 1.1.3
          stax-utils 20060502 -> 20070216
          bcprov 1.45 -> 1.46
          isoparser 1.0-RC-1 -> 1.0-RC-15
          metadata-extractor 2.6.2 -> 2.9.0 
          jsr107cache 1.0 -> 1.1
          concurrentlinkedhashmap 1.2 -> 1.4.2
          FastInfoset 1.2.2 -> 1.2.13
          groovy 2.4.4 -> 2.4.6
          jmagick 6.2.4 -> 6.6.9
          livetribe-jsr223 2.0.6 -> 2.0.7
          netcdf 4.2-min -> 4.2.20
          spring-social-facebook 1.0.0.RC1 -> 1.1.1.RELEASE
          spring-social-web 1.0.3.RELEASE -> 1.1.4.RELEASE
          spring-social-twitter 1.0.5.RELEASE -> 1.1.2.RELEASE
          spring-security-core 3.1.3.RELEASE -> 3.1.7.RELEASE
          aspectjrt 1.8.2 -> 1.8.7
          solr4 4.10.3 -> 4.10.4
          shale-test 1.0.4 -> 1.0.5,
      130709: REPO-482 The platform uses the simple-to-upgrade libraries for 5.2
         - UNDO metadata-extractor 2.6.2 -> 2.9.1 TikaAutoMetadataExtracterTest testImageVideo is failing.
                Had expected to have been able to take out the patch made in MNT-13920, but the metadata
                and properties now appear to be wrong in another way!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:15:35 +00:00
Alan Davis
6f411d0d27 Merged 5.2.N (5.2.1) to HEAD (5.2)
130406 jvonka: REPO-1062 / MNT-16176: allow existing users to use SSO external auth via Sharewhen repo is read-only
   - re-implement the fix (note: we do not allow auto-creation of missing users)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:03:27 +00:00
Derek Hulley
d38aa8a615 Better fix for MNT-15210: Running the 5.0 Linux Installer cmd line points me to 4.2 documentation (REPO-1518)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-02 12:20:37 +00:00
Alex Mukha
623cbf2f06 REPO-1472 Security: ACE-5512 Java 8 multiple vulnerabilities
REPO-1481: Update POM files
   - Change the Java version put into the full installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@131865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-28 14:22:35 +00:00
Alex Mukha
8138f61f8a REPO-1260: Upgrade installer version of LibreOffice to 5.2.1
- Upgraded libreoffice to 5.2.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@131823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-27 09:38:51 +00:00
Alex Mukha
b63f8eaddf REPO-1260: Upgrade installer version of LibreOffice to 5.2.1
- Upgraded libreoffice to 5.2.1, changed the checks to include libcairo2 and libgl1-mesa-glx


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131822 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-27 09:38:39 +00:00
Alex Mukha
05a02a2166 Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
131788 amukha: Merged 5.1.2 (5.1.2) to 5.1.N (5.1.3)
      131783 slanglois: REPO-898 : Updated the AOSM version to the latest 1.1.4 in Full Installer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@131789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-26 12:36:59 +00:00
Kevin Roast
119a2763bb ACE-4881 - [Pentest 121015] Multiple admin CSRF
- Fix issue spotted by Michael Suzuki, where the /s endpoint was not configured correctly to generate CSRF tokens

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-19 08:22:15 +00:00
Kevin Roast
9732e0f9b6 Merged 5.2-DEV (5.2.0) to 5.2.N (5.2.N)
131352 kroast: ACE-4881 - [Pentest 121015] Multiple admin CSRF
      - Added CSRF filter config to protect the Alfresco Admin Console pages

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-17 15:14:22 +00:00
Alan Davis
a7b3c8feba Merged 5.2.N-SERVLET-3.0 (5.2.1) to 5.2.N (5.2.1)
130708: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part I),
   130714: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)
   - fix web.xml (web-app),
   130727: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)
   - update other web.xml's (other than web-client project),
   130844: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
   - update to servlet-api 3.0.1,
   130847: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
   - follow-on to commit the correct pom.xml (ie. parent rather than overlay),
   130852: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
   - follow-on


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-12 11:33:40 +00:00
Alex Mukha
c12cf2c618 Merged DEV to 5.2.N (5.2.1)
131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
   131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
   131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - added patch to remove JBPM database tables
   131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - replaced generic DB script with database specific scripts
   131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix DB2 patch
   131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix JBPM table removal patch

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-10 17:34:57 +00:00
Alex Mukha
69c1465583 Merged DEV to 5.2.N (5.2.1)
131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
   131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
   131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - added patch to remove JBPM database tables
   131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - replaced generic DB script with database specific scripts
   131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix DB2 patch
   131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix JBPM table removal patch

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-10 17:34:57 +00:00
Alex Mukha
7fb3929212 Merged 5.2.N (5.2.1) to trunk (5.2)
131124 amukha: ALF-21229: Installer: "View Readme File" option displays information-less file
      - Changed readme to point to the new community site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@131125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-30 16:27:40 +00:00
Alex Mukha
54d61922dc ALF-21229: Installer: "View Readme File" option displays information-less file
- Changed readme to point to the new community site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@131124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-30 16:02:22 +00:00
Alex Mukha
c4a3f9f01d Merged 5.2.N (5.2.1) to HEAD (5.2)
131121 amukha: ALF-21229: Installer: "View Readme File" option displays information-less file
      - changed the README to point to new community site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@131122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-30 15:25:51 +00:00
Alex Mukha
09f42daf62 ALF-21229: Installer: "View Readme File" option displays information-less file
- changed the README to point to new community site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131121 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-30 15:23:15 +00:00
Alex Mukha
ccd04c7e80 REPO-1006: Move Alfresco 'data-model' to Git
- removed project files
   - changed the dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-19 13:09:16 +00:00
Alex Mukha
74bfbe0367 REPO-1006: Move Alfresco 'data-model' to Git
- removed project files
   - changed the dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-19 13:09:16 +00:00
Alan Davis
5a0ee49f6b Merged 5.2.N-UPGRADES (5.2.1) to 5.2.N (5.2.1)
130660: Merged 5.2-UPGRADES (5.2.1) to 5.2.N-UPGRADES (5.2.1)
      << Some things have moved forwards on 5.2.N so the original commits are not the same >>
         - AuthUsers upgraded to the same as 5.2.N (5.2.0.1 -> 5.2.0.3)
         - isoparser upgraded to the same as 5.2.N (1.0-RC-15 to 1.0.2)
      125130: ACE-4055 Revert upgrade of json to 20160212: it has incompatible changes,
      125114: BDE-624 First batch of 3rd party upgrades in enterprise projects
        jasypt 1.9.1 -> 1.9.2
        vaadin 6.8.8 -> 6.8.16,
      125015: BDE-624 First batch of 3rd party upgrades
       Spring Framework 3.2.14.RELEASE -> 3.2.16.RELEASE
       Jackson2 2.3.2 -> 2.7.3
       httpcomponents 4.5.1 -> 4.5.2
       mysql driver 5.1.35 -> 5.1.38
       postgresql driver 9.4-1201-jdbc41 -> 9.4.1208.jre7
       slf4j 1.7.12 -> 1.7.21
       json 20090211 -> 20160212
       joda-time 2.8.1 -> 2.9.3
       commons-compress 1.9 -> 1.11
       commons-net 3.3 -> 3.4
       commons-validator 1.4.1 -> 1.5.0
       axiom 1.2.15 -> 1.2.18
       jaxb 2.2.6 -> 2.2.7
       myfaces 1.1.8 -> 1.1.10
       h2 1.4.187 -> 1.4.191 
       browsermob 2.1.0-beta-1 -> 2.1.0-beta-5
       javax.mail 1.5.2 -> 1.5.5
       derby 10.11.1.1 -> 10.12.1.1
       wss4j 1.5.12 -> 1.6.19
       XmlSchema 1.4.5 -> 1.4.7
       xstream 1.2.2 -> 1.3.1
       geronimo-ws-metadata_2.0_spec 1.1.2 -> 1.1.3
       stax-utils 20060502 -> 20070216
       bcprov 1.45 -> 1.46
       isoparser 1.0-RC-1 -> 1.0-RC-15
       metadata-extractor 2.6.2 -> 2.9.0 
       jsr107cache 1.0 -> 1.1
       concurrentlinkedhashmap 1.2 -> 1.4.2
       FastInfoset 1.2.2 -> 1.2.13
       groovy 2.4.4 -> 2.4.6
       jmagick 6.2.4 -> 6.6.9
       livetribe-jsr223 2.0.6 -> 2.0.7
       netcdf 4.2-min -> 4.2.20
       spring-social-facebook 1.0.0.RC1 -> 1.1.1.RELEASE
       spring-social-web 1.0.3.RELEASE -> 1.1.4.RELEASE
       spring-social-twitter 1.0.5.RELEASE -> 1.1.2.RELEASE
       spring-security-core 3.1.3.RELEASE -> 3.1.7.RELEASE
       aspectjrt 1.8.2 -> 1.8.7
       solr4 4.10.3 -> 4.10.4
       shale-test 1.0.4 -> 1.0.5,
   130709: REPO-482 The platform uses the simple-to-upgrade libraries for 5.2
      - UNDO metadata-extractor 2.6.2 -> 2.9.1 TikaAutoMetadataExtracterTest testImageVideo is failing.
             Had expected to have been able to take out the patch made in MNT-13920, but the metadata
             and properties now appear to be wrong in another way!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-15 23:12:42 +00:00
Jean-Pierre Huynh
1e0fdf6082 Merged trunk (5.2) to 5.2.N (5.2.1)
130582 jphuynh: BDE-790: Fix EAR last mentions to install.version.name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@130583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-12 15:25:59 +00:00
Jean-Pierre Huynh
1dfe3e2fc2 BDE-790: Fix EAR last mentions to install.version.name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@130582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-12 15:25:09 +00:00
Jean-Pierre Huynh
d56df15714 Merged trunk (5.2) to 5.2.N (5.2.1)
130579 jphuynh: BDE-790: Change EAR final naming.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@130580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-12 14:49:35 +00:00
Jean-Pierre Huynh
8a7aca64b5 BDE-790: Change EAR final naming.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@130579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-12 14:48:34 +00:00
Jean-Pierre Huynh
86cd0fdf53 Merged trunk (5.2) to 5.2.N (5.2.1)
130561 jphuynh: BDE-790: Change Alfresco One installers final naming. Community keeps the date based naming convention.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@130562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-12 12:28:13 +00:00
Jean-Pierre Huynh
cc25898a69 BDE-790: Change Alfresco One installers final naming. Community keeps the date based naming convention.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@130561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-12 12:24:52 +00:00
Jan Vonka
62abd85155 REPO-1062 / MNT-16176: allow existing users to use SSO external auth via Sharewhen repo is read-only
- re-implement the fix (note: we do not allow auto-creation of missing users)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-07 13:20:10 +00:00
Alan Davis
1ebc4289dd Merged 5.2.N (5.2.1) to HEAD (5.2)
130130 dhulley: Update root dependency for alfresco-core to 6.5 (REPO-990)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:47:24 +00:00
Alan Davis
c2a6decad3 Merged 5.2.N (5.2.1) to HEAD (5.2)
130105 dhulley: Use alfresco-core:6.5 for the web-client project (REPO-990)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:47:06 +00:00
Alan Davis
c12bf069fa Merged 5.2.N (5.2.1) to HEAD (5.2)
129764 jvonka: REPO-1144: LockService - add isLocked & isLockedAndReadOnly common helper methods to public API
   - remove duplicated code from various locations to use the new methods
   - add sanity checks to Lock*Test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:42:34 +00:00
Derek Hulley
d4bc32505d Update root dependency for alfresco-core to 6.5 (REPO-990)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-05 15:04:32 +00:00
Derek Hulley
9ed7db305f Use alfresco-core:6.5 for the web-client project (REPO-990)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-02 18:07:54 +00:00
Steven Glover
1fca19d9a1 Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:33:09 +00:00
Steven Glover
1efcf2c319 Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:33:09 +00:00
Steven Glover
c53a27121b Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:33:09 +00:00
Steven Glover
0af48e69f3 Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:33:09 +00:00
Steven Glover
d3938f94f3 Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:33:09 +00:00
Jan Vonka
1b3745109c REPO-1144: LockService - add isLocked & isLockedAndReadOnly common helper methods to public API
- remove duplicated code from various locations to use the new methods
- add sanity checks to Lock*Test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:20:52 +00:00
Alan Davis
024857b8ee Merged 5.2.N (5.2.1) to trunk (5.2)
129413 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      129412 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         128754 slanglois: MNT-16391 Upgrade AOS Module to 1.1.3 in Full Installer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@129414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-10 09:52:51 +00:00
Alan Davis
f9ad5b8c61 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
129412 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      128754 slanglois: MNT-16391 Upgrade AOS Module to 1.1.3 in Full Installer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@129413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-10 09:51:17 +00:00
Alan Davis
1ff552c288 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
128754 slanglois: MNT-16391 Upgrade AOS Module to 1.1.3 in Full Installer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@129412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-10 09:50:42 +00:00
Alexandru Epure
983ab23eb2 Merged 5.2.N (5.2.1) to HEAD (5.2)
128388 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128377 cpopa: MNT-16208 : infinite HTTP loop on /wcservice when using alfrescoNtlm with sso.enabled=false
         -Replaced "webscripts.authenticator.webclient" with "webscripts.authenticator.remoteuser" so to prevent attempts to redirect to the same url, thus eliminating infinite loops. 
         -RemoteUserAuthenticatorFactory seems to work just fine. Also since the Explorer is EOLed it doesn't make anymore to use the WebClientAuthenticatorFactory. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:55:59 +00:00
Alexandru Epure
bbf4d627c6 Merged 5.2.N (5.2.1) to HEAD (5.2)
128238 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128224 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         128205 amukha: MNT-16334: AOSM is not working on any web server except Tomcat
            - Added placeholders for AOSM configuration for building full ear file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:52:34 +00:00