Commit Graph

11 Commits

Author SHA1 Message Date
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
Erik Winlof
6722639949 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80925: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80870: ACE-2091 EOL Explorer.
       - Move of WebClient configuration, message bundles and extension points to Thor private module
       - Added handling to SSO endpoints to handle optional WebClient config service
       - Tested: Enterprise build, Cloud build, build unit tests, NTLM SSO/Cookie SSO path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 05:54:57 +00:00
Erik Winlof
124f05593e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:18:05 +00:00
Erik Winlof
34d911b025 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78414: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75784: ACE-2149: EOL AVM / WCM
       - Get 'web-client' project to compile
       - For further work, all bits that required commenting or changing were tagged with '// WCM'
         i.e. a search for 'WCM' will highlight all the code changes made
       - TODO: Visit jsp files and other config to do a proper job


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:08:20 +00:00
Will Abson
e895e57280 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71601: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70356: MNT-11233: DEV to V4.2-BUG-FIX (4.2.3)
         67973: MNT-11233: Alfresco CMIS API /alfresco/api/-default-/cmis/versions/1.1/atom cannot be used with external authentication
            - Move RemoteUserMapper from Web-Client to Repository project. Use RemoteUserMapper in PublicApiAuthenticator to retrieve remote user from request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:31:06 +00:00
Alan Davis
118d78e6f2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61361: BDE-180 Refactored the system tests to use the maven tomcat plugin, self-contained alf_data/database and tests running in parallel.
   Removed duplicate freemarker jar.  Now uses the one defined in the repo project
   add JCL for Slf4j
   Fixed failing JmxScriptTest by ensuring that "quick" files are loaded from the classpath
   Changed the unpacking of upstream resources to the "prepare-package" phase
   BDE-249 Separate unit tests in a test suite on their own
      Moved the thor unit tests into their own suite
      Moved the enterprise remote-api unit tests into their own suite
      Moved the enterprise repository unit tests into their own suite
      Moved the webclient unit tests into their own suite
      Moved the wdr unit tests into their own suite
      Moved the repository unit tests into their own suite
      Moved the remote-api unit tests into their own suite
   Change null to "" for freemarker template
   Moved META-INF/services so they get added to the jar
   Speeding up the wcmquickstart client tests, reducing the thread.sleeps().
   Fixed failing date/time tests, remove a redundant test and corrected an import
   Added a h2 profile for running against a h2 database


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:23:04 +00:00
Alan Davis
c05b991ec0 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58499: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58472: Fix build error as a result of the merge of
         58405 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
           58384: MNT-9979 : Merge DEV to V4.1-BUG-FIX
             58338 : MNT-9979 : External authentication fails if Kerberos SSO is also enabled, although Kerberos is later in the chain than External
             Add new unit test. Add remoteUserMapper for webDavAuthenticationFilter in kerberos authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:44:18 +00:00
Alan Davis
b56dd58198 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58493: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58405: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58384: MNT-9979 : Merge DEV to V4.1-BUG-FIX
          58338 : MNT-9979 : External authentication fails if Kerberos SSO is also enabled, although Kerberos is later in the chain than External
          Add new unit test. Add remoteUserMapper for webDavAuthenticationFilter in kerberos authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:39:29 +00:00
Alan Davis
d6fe445d7c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57385: Fixed failing tests by not loading the config at all, BDE-195


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:38:40 +00:00
Alan Davis
ebd9509eae Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57366: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57339: Fixed failing tests by loading the test resource config from the class path, BDE-195


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:37:05 +00:00
Samuel Langlois
e60d57ea42 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00