Commit Graph

2607 Commits

Author SHA1 Message Date
Joel Bernstein
ad8e4d0eaa ACE-777: integrate the X509 Auth Servlet Filter into solr4 and web-client projects.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-21 15:07:27 +00:00
Samuel Langlois
92e919c9ba Merged AIR-SPRINT1 (5.1.0) to HEAD (5.1/Cloud)
107702: Only show the share link if "share-services" is installed RA-398


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-21 10:47:10 +00:00
Tatyana Valkevych
b15a2e772b 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
a2349e101f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106223: Merge RA-SPRINT6 to HEAD-BUG-FIX (5.1)
      105509: RA-306: make integration tests use the runtime/alf_data folder.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106301 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-16 19:24:13 +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
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
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
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
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
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
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
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
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
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
f32360afb1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90921: MNT-12765 - No endpoints can be configured in Share that use external-auth and a different URL - as they will be redirected down the URL for 'alfresco' endpoint.
   Merged PROPERTY_GROUP_PROTOTYPING (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      90742: Refactoring of SSO paths
       - Added Session User authentication support to RemoteUserAuthenticatorFactory - so can use cookie based auth for example with Public API route.
       - Tidy up of common duplicated code constants e.g. _alfAuthTicket
       - Added Global Authentication Filter around the /api/* endpoint to allow SSO active over Public API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:07:31 +00:00
Alan Davis
04eb119eff Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90919: MNT-12764 - The X-Alfresco-Remote-User (SsoUserHeader) SSO code path executes x2 requests and is stateful when it does not need to be
   Merged PROPERTY_GROUP_PROTOTYPING (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      90559: Refactoring of SSO paths
       - Web-client mappings for new authenticator


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:07:05 +00:00
Alan Davis
41d2fdb3a9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
87973: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      87841: Merged DEV to V4.2-BUG-FIX (4.2.4)
         87072: MNT-12412 : HTTP Basic auth to /alfresco/cmisatom fails when passthru SSO is enabled
            - Added basic SSO fallback to NTLM and PASSTHRU subsystems.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94554 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:49:46 +00:00
Alan Davis
a4cc7dac9c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
87703: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      86519: Merged DEV to V4.2-BUG-FIX (4.2.4).
         86173: MNT-12417: Send mail action in Alfresco Explorer is using neither the default from adress nor the currently logged in user's adress


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:47:33 +00:00
Alan Davis
ed947e5a98 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
86193: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      86111: Merged DEV to V4.2-BUG-FIX (4.2.4)
         86029 : MNT-12463 : logout button is displayed in Share (and in Explorer) when 'external' authentication is used/context.externalAuthentication not taken into account
            - Logout button is will be displayed if logged not a guest and not used 'external' authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:43:05 +00:00
Alan Davis
0e6c3f18ac Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85757: MNT-12461 : Enable and fix FormUIGetRestApiIT following merged of MNT-11660 from V4.2-BUG-FIX - update web-scripts-application-context-webframework-test.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:34:07 +00:00
Alan Davis
de2a66166c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85753: MNT-12461 : Enable and fix FormUIGetRestApiIT following merged of MNT-11660 from V4.2-BUG-FIX
    Tune the pom.xml and updated test-config-custom-forms.xml .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:33:58 +00:00
Alan Davis
381840c2bd Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85731: MNT-12461: Bring back the changes of MNT-11660
      - moved the new test from web-framework-commons to web-client, where it belongs (w-f-c shouldn't depend on remote-api)
      - renamed the test FormUIGetRestApiIT because it is an integration test, not a unit test
      - disabled the execution of this test. Needs more work to sort it out - probably missing dependencies
      85650: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         << Breaks the build >>
         85615: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            <<Reverting the reverse - unit test was fixed>>
            80815: Fix Build (pt2) Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
               80357: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
                  79075: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
                     78918: Merged DEV to V4.2.3 (4.2.3)
                        78889: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                           Was added new unit test.
                  79079: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
                     78994: Merged DEV to PATCHES/V4.2.3 
                      78981 : MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                         Updated some code for unit test.
                  79081: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
                     79043: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                        Added webframeworkcommons classpath for unit test in build.xml .
                  79138: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Rename config file for test and update unit test source.
                  79140: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Deleted old config file for test.
                  79283: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Added info messages to unit test
                  80123: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Added info messages and log to unit test. 
                  80207: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Updated the freemarker template for test webscript
                  80261: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Updated unit test. 
                  80302: MNT-11660 : Share textarea.ftl appears even when the aspect of the property is not applied
                     Updated unit test. 
         


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:33:48 +00:00
Alan Davis
571f2feb1d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85562: Change version to 5.0.1 and incremented the schema number
      - pom.xml files changed from 5.0-BF-SNAPSHOT to 5.0.1-SNAPSHOT
      - schema number increased by 8 rather than 4 (which is the normal increment for a service pack) as this is SP 1
        and as a result it is more likely we will need a few more db patches in 5.0.0


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:30:19 +00:00
Alan Davis
f80921475c Cloud release: change version to 5.0-SNAPSHOT (again) in pom.xml and 5.0.0 in version.properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@91328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-28 11:05:30 +00:00
Alan Davis
9e8077908c Community release: change version to 5.0.c in pom.xml and 5.0.0c in version.properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@91299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-27 20:57:15 +00:00
Gethin James
27388a1511 Use the 1.2.4 events/messaging artifacts ACE-3477, ACE-3450
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@90351 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-12 21:10:30 +00:00
Samuel Langlois
628835c790 Switch version from 5.0.0-SNAPSHOT to 5.0
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-05 16:00:05 +00:00
Jared Ottley
e04fa83ce0 [ACE-3372] CORS enable Alfresco One
-Add maven artifact dependencies for CORS Filter libraries to web-client projects pom.xml
-Add filter and filter mapping declarations to web-client projects web.xml
--These declarations are commented out by default.
--When uncommented the Share web client's domain must be added to the list of allowed origins because the share proxy service can call resources filtered by the mappings
--The default mappings that will be filtered when uncommented are /api/*, /service/*, /s/*, and /cmisbrowser/*



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-31 04:18:50 +00:00
Steven Glover
4997e9a74c ACE-3300 "Enabling Messaging and Event Subsystem issues"
Update services dependencies to 1.2.3 (which re-instate external ActiveMQ broker by default)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-28 11:37:40 +00:00
Steven Glover
9f70bf021c ACE-3252 "Convert the Events queue to a Topic"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-27 10:31:29 +00:00
Samuel Langlois
c89ebad82a ACE-3203 Make sure Enterprise versions of alfresco and share war have a MANIFEST.MF that identifies them as Enterprise for MMT
- the Implementation-Title should end with Enterprise


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-20 11:45:57 +00:00
Gethin James
43f8e5e111 Removed the Events snapshot dependency for release: ACE-2920
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88723 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-20 09:38:45 +00:00
Samuel Langlois
313e39111c ACE-2996 Make sure file transfer receiver embeds the version.properties with the right Edition
Also, bring back version.properties in community war, for convenience


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-17 11:42:32 +00:00