Commit Graph

4344 Commits

Author SHA1 Message Date
Alan Davis
ecd3666eae Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105903: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105852: MNT-13294: Fixed environment validation messages display.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105952 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-11 13:25:49 +00:00
Alan Davis
900a4110cd Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104598: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      104135: RA-174 Move Share sample configuration files to Share codebase


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104669 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:45:28 +00:00
Alan Davis
7f34d3611b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104591: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      103842: RA-213: merge 103766:103840 from ^/alfresco/BRANCHES/DEV/mward/ra4-main-rt


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:40:15 +00:00
Alan Davis
a837271f7e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104590: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      103505: RA-209 Use released version 5.1 of alfresco-jlan


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:39:31 +00:00
Alan Davis
426be8b4b5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104590: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      103505: RA-209 Use released version 5.1 of alfresco-jlan


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:39:31 +00:00
Alan Davis
2f97193fba Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104589: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      103483: RA-210 Use released version 5.1 of alfresco-core


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:39:00 +00:00
Alan Davis
a3088e7e04 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104589: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      103483: RA-210 Use released version 5.1 of alfresco-core


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:39:00 +00:00
Alan Davis
4f7ec44195 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104582: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      103015: RA-205: refactored so that target/nossl dir is no longer needed and slightly fewer steps used.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:29:55 +00:00
Alan Davis
ceebc2eb40 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104581: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      103012: RA-205: Allow tomcat7 to run 'nossl' version of web.xml deployment descriptor


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:29:06 +00:00
Alan Davis
7a5a9562b7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104579: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102989: RA-203: Move FormUIGetRestApiIT.java out of alfresco-platform


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:23:00 +00:00
Alan Davis
243fee317e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104577: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102942: RA-202: Break dependency to spring-surf in alfresco-platform


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:21:59 +00:00
Alan Davis
40c72b9722 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104575: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102922: RA-177: Copy run profile and supporting XML to main code base projects


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104644 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:20:54 +00:00
Alan Davis
f04675ce6b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104574: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102921: RA-178: Create tomcat directory and configuration files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:17:00 +00:00
Alan Davis
bf2e3bf36e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104572: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102752: RA-190 Switch to surf-webscripts 5.1 + remove spurious dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:12:33 +00:00
Samuel Langlois
df852bbdc3 Merge HEAD-BUG-FIX (5.1) to HEAD (5.1/Cloud40)
102524: Merge RA-SPRINT3 to HEAD-BUG-FIX (5.1)
      102219: RA-143 / ACE-3933  Produce non-SSL versions of alfresco-platform and alfresco-enterprise wars, to ease testing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-30 11:13:36 +00:00
Samuel Langlois
11435622ec Merge HEAD-BUG-FIX (5.1) to HEAD (5.1/Cloud40)
102522: Merge RA-SPRINT3 to HEAD-BUG-FIX (5.1)
      102145: RA-121, RA-141 & RA-48: Provide the ability to use an alfresco-global.properties file with -Prun and move the alf_data folder to the new runtime folder.
      NOTE: The web-client project has NOT been updated yet to handle an alfresco-global.properties file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103276 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-30 11:11:25 +00:00
Tatyana Valkevych
202e821dcc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102012: Merge 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1)
      102010: MNT-13877 Upgrade OpenSSL to 1.0.1m on Linux and OSX + PostgreSQL 9.3.6 linked with it


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102082 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-17 11:03:33 +00:00
Tatyana Valkevych
0bd46f7106 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102012: Merge 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1)
      102010: MNT-13877 Upgrade OpenSSL to 1.0.1m on Linux and OSX + PostgreSQL 9.3.6 linked with it


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102082 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-17 11:03:33 +00:00
Tatyana Valkevych
2207a4d730 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101318: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100015: RA-60 Rename alfresco.war into alfresco-platform.war


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:14:41 +00:00
Tatyana Valkevych
1832934416 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101318: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100015: RA-60 Rename alfresco.war into alfresco-platform.war


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:14:41 +00:00
Tatyana Valkevych
3216523536 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101159: DOCS-1067 Fixing generation of Javadoc with JDK8


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 15:38:38 +00:00
Alan Davis
837fedddac Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100469: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100323: Changed alfresco-messaging-repo dependency to 1.2.5. to support SSL connections to ActiveMQ RNA-491


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:17:04 +00:00
Alan Davis
36680a6542 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
c5acc837c5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99628: RA-14 Properly share Maven assembly descriptor of the Alfresco distribution between Community and Enterprise


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:50:27 +00:00
Alan Davis
a21444f1a0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99610: Merged DEV to HEAD-BUG-FIX (5.1) - separating Share from Repo
      99073: RA-11 Get rid of the alfresco_svn_rootdir parameter in Bitrock installers: everything is now extracted from the Maven repo
      99114: RA-11 Remove reference to alfresco_svn_rootdir in Bitrock config file, to fix Linux installer
      99510: RA-39 Fix how we get the JLAN DLL in the distribution: use Maven dependency rather than file system
      99515: RA-39 Fix how we get the JLAN DLL in the enterprise distribution: use Maven dependency rather than file system


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:50:11 +00:00
Alan Davis
514dac407e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99610: Merged DEV to HEAD-BUG-FIX (5.1) - separating Share from Repo
      99073: RA-11 Get rid of the alfresco_svn_rootdir parameter in Bitrock installers: everything is now extracted from the Maven repo
      99114: RA-11 Remove reference to alfresco_svn_rootdir in Bitrock config file, to fix Linux installer
      99510: RA-39 Fix how we get the JLAN DLL in the distribution: use Maven dependency rather than file system
      99515: RA-39 Fix how we get the JLAN DLL in the enterprise distribution: use Maven dependency rather than file system


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:50:11 +00:00
Alan Davis
da4658e87d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99610: Merged DEV to HEAD-BUG-FIX (5.1) - separating Share from Repo
      99073: RA-11 Get rid of the alfresco_svn_rootdir parameter in Bitrock installers: everything is now extracted from the Maven repo
      99114: RA-11 Remove reference to alfresco_svn_rootdir in Bitrock config file, to fix Linux installer
      99510: RA-39 Fix how we get the JLAN DLL in the distribution: use Maven dependency rather than file system
      99515: RA-39 Fix how we get the JLAN DLL in the enterprise distribution: use Maven dependency rather than file system


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:50:11 +00:00
Alan Davis
7f4a93b03c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99609: Merged DEV to HEAD-BUG-FIX (5.1) - separating Share from Repo
      98758: RA-11: remove activity-list.properties placeholder - will be replaced with real files
      98759: RA-11: added activity-list.get*.properties to repository.
        Denormalising the properties files. This does have the downside of having these properties defined twice, however the benefit is a decoupled code base. Alternatives would include having them in a common project that both the repository and share depend on. We may rethink if this becomes a problem.
      98760: RA-11: removed dummy slingshot.properties from repo.
      98761: RA-11: added cut-down slingshot*.properties files.
        Only 4 of the 1200+ properties are likely to be required, according to the old web-client.pom.xml comments. If it turns out that a substantial number of them are required, we'll rethink.
      98790: RA-11: fix activity list bundle names
        I missed that the previous build time copy fitered the '.get' from the name.
      98861: RA-11: remove unsightly comment.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:47:57 +00:00
Alan Davis
eb647cb49e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99607: Merged DEV to HEAD-BUG-FIX (5.1) - separating Share from Repo
      98570: RA-11: remove slingshot project, fix up poms.
        Temporary fix included: removed antrun execution of fetch-slingshot-messages in projects/web-client/pom.xml - this allows a full build in the main code base, with e.g. mvn clean install -Penterprise,solr-http
      98616: RA-11: Removed share-po from main code-base.
      98747: RA-8 Remove Share Enterprise - moved into its own space


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:42:19 +00:00
Alan Davis
44484d5139 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99604: RA-14 Move installer build scripts into the jar file, so the Enteprise installer can reuse them properly


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:34:56 +00:00
Alan Davis
e09a7663c4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99604: RA-14 Move installer build scripts into the jar file, so the Enteprise installer can reuse them properly


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:34:56 +00:00
Alan Davis
37501be12a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99117: ACE-3703 - Refactor Repository Admin Console framework to allow the basic framework to work in Community version
    - Improved Community system summary screen with basic JVM and Repository info
    - Added Processor (cpus) count to System Summary screen for Enterprise/Community
    - Added system version label to /alfresco index page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99183 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 22:37:51 +00:00
Alan Davis
68ac3bcdf9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99067: ACE-3703 - Refactor Repository Admin Console framework to allow the basic framework to work in Community version
    - Added Community Admin Console link to index page
    - Basic system summary screen impl


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-09 21:21:18 +00:00
Alan Davis
2b5b252130 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98518: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98504: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98432: MNT-13492 Remove additional /WAIT in Windows script to stop tomcat


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:44:52 +00:00
Alan Davis
f5b1ec7735 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98427: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98385: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98335: MNT-13467: Merged CLOUD39 (Cloud 39.3) to 5.0.1 (5.0.1)
            98254: MNT-13466: 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98534 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:43:45 +00:00
Tatyana Valkevych
d7c4ac87da Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98198: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98160: Merged DEV to 5.0.N (5.0.2)
         98042: MNT-13442: Accessing nodes via ticket URL yields "Error during download content servlet processing: null"
            - added null check for normal resource bundle


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-02 12:08:44 +00:00
Alan Davis
92d0fc86b6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97317: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97316: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         97266: MNT-13333, MNT-13336 : Upgrade to apache-tomcat-7.0.59 and java-1.8.0_31


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-18 08:15:10 +00:00
Alan Davis
3a67433d8a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96588: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96587: MNT-13327 Upgrade cors-filter to 1.9.3, for sharepoint integration" projects//web-client
         Also, delete the cors-filter declaration from privatemodules/thor/pom.xml, so the one in web-cliebnt prevails


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-10 13:18:59 +00:00
Alan Davis
086d14a8dc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94372: Fix build: StackOverflow caused by MASSEMBLY-747 in maven-assembly-plugin
   Upgrade a few Maven plugins
   Remove calls to manifest goal of maven-war-plugin, thanks to its version 2.6 fixing MWAR-167


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:39:28 +00:00
Alan Davis
12d42a1fd0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93267: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93242: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93175: MNT-12484: Merged DEV to V4.2-BUG-FIX (4.2.5)
            89773: MNT-12484: VTI server fails to authenticate behind an AJP proxy if HTTP authentication headers are sent in addition to the REMOTE_USER CGI variable
               - For VTI give precedence to external authentication with remote user over HTTP Basic


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:20:43 +00:00
Alan Davis
af062747c9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92838: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92824: MNT-13098 Refresh list of dependencies in Platform Distribution POM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:08:36 +00:00
Alan Davis
b36abc7495 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92637: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92609: MNT-13050: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92590: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            << Also included some extra changes for 5.0.N >>
            92585: Merged V4.1-BUG-FIX (4.1.10) to V4.2.4 (4.2.4)
               92550: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  92444 : MNT-12987 : Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
                  92458 : MNT-12987 : Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
                     - Renamed splash_2015.png
         92606: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            92605: MNT-13042: CLONE - Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
            - A few more files for 4.2.4
         - A few more files for 5.0.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:55:26 +00:00
Alan Davis
daf3e57c04 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92637: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92609: MNT-13050: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92590: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            << Also included some extra changes for 5.0.N >>
            92585: Merged V4.1-BUG-FIX (4.1.10) to V4.2.4 (4.2.4)
               92550: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  92444 : MNT-12987 : Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
                  92458 : MNT-12987 : Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
                     - Renamed splash_2015.png
         92606: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            92605: MNT-13042: CLONE - Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
            - A few more files for 4.2.4
         - A few more files for 5.0.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:55:26 +00:00
Alan Davis
ce4d6c872a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92637: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92609: MNT-13050: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92590: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            << Also included some extra changes for 5.0.N >>
            92585: Merged V4.1-BUG-FIX (4.1.10) to V4.2.4 (4.2.4)
               92550: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  92444 : MNT-12987 : Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
                  92458 : MNT-12987 : Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
                     - Renamed splash_2015.png
         92606: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            92605: MNT-13042: CLONE - Copyright notice '© 2005-2014. Alfresco Software, Inc. All Rights Reserved.' should now be ' © 2005-2015...'
            - A few more files for 4.2.4
         - A few more files for 5.0.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:55:26 +00:00
Alan Davis
e9d98d5802 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92620: ACE-3703 - Refactor Repository Admin Console framework to allow the basic framework to work in Community version
     - Framework base moved to web-client project.
     - Refactored Enterprise admin console to base from the web-client one.
     - Empty Community admin console start page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:53:46 +00:00
Alan Davis
fc9b9a6311 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92259: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92130: MNT-12951 Upgrade Java bundled in installers to 1.8.0_25


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:46:29 +00:00
Alan Davis
bca95f01fa Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92249: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92088: MNT-12938 Tune JVM GC parameters in installer for Solr4: -XX:+UseConcMarkSweepGC -XX:+UseParNewGC


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:46:02 +00:00
Alan Davis
2557fe5bfe Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92151: ACE-3667 Fix compilation in Java8: make maven-jibx-plugin depend on bcel 6.0-RC3


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:44:51 +00:00
Alan Davis
7876446ecf Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91882: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91814: share-config-custom.xml inline documentation and config updates for installer since MNT-12801, MNT-12764 and MNT-12765


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:41:14 +00:00
Alan Davis
783437d8a7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91271: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      91116: Merged DEV to V4.2-BUG-FIX (4.2.5)
         91097: MNT-12800 : Automatic installer on Linux is not checking for the presence of cups-libs
            - Added check for the presence of libcups.so.2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:19:19 +00:00