Commit Graph

579 Commits

Author SHA1 Message Date
Alan Davis
0e0e903b61 Merged 5.1.N (5.1.1) to HEAD (5.1)
117597 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      117582 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
         116652 amorarasu: MNT-14983: CMIS: Euro character not encoded correctly
            Merged V4.2.4 (4.2.4.19) to V4.2-BUG-FIX (4.2.6)
               115140 115998 116396 amorarasu: MNT-15044: CLONE - CMIS: Euro character not encoded correctly
                  - Removed the unicode interval that was used to escape characters from the categories: currency, general punctuation, subscripts and superscripts (2000-20FF).
                  - Changed the way the control characters are filtered + adapted tests.
                  - Removed unnecessary j_string use from the ftl and added proper xml encoding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:27:03 +00:00
Tatyana Valkevych
74897b5af4 ACE-5040: Merged 5.1.N (5.1.1) to HEAD (5.1)
120106 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120071 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
         119848 adragoi: Merged DEV to 5.0.3 (5.0.3)
            119808 adragoi: MNT-15338 : CMIS get object by path only shows the working copy file and not the original file
               - reverted commits related to "Ghost versions when Document is created with CheckinType CHECKOUT" stask :  
               100772 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix for tests failures
               100824 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                     100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                        99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Don't include PWC in a version series
                        99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Return PWC as a part of version series. Fixes to pass TCK
               100837 : Fix another merge issue as a result of a re factor that has taken place in 5.0
                  Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                     100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                        100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                           99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Don't include PWC in a version series
                           99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Return PWC as a part of version series. Fixes to pass TCK
               101404 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
                     100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                        - Added init-method for CMISConnector. Test is added
               101597 : Merged DEV to 5.0.N (5.0.2)
                  101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 12:16:13 +00:00
Jean-Pierre Huynh
f8fa061ba3 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
      r117774 gjames: RA-567: Increase /workflow/processes API code coverage
      r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
      r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
      r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
      r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
      r116286 gjames: RA-567: Increase /workflow/processes API code coverage
      r115853 gjames: RA-566: Increasing /people api coverage (description field)
      r115811 gjames: RA-566: Increasing /people api coverage
      r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
      r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
      r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
      r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
      r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
      r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
      r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
      r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
      r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112237 gjames: Adding additional test coverage for TaggingService RA-529
      r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
      r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
      r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
      r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
      r111620 gjames: Adding additional test coverage for PermissionService RA-524
      r111619 gjames: Added some @Override to make Sonar happier
      r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
      r111427 gjames: Adding additional test coverage for AttributeService RA-509
      r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:35:05 +00:00
Jean-Pierre Huynh
921dbb04ae Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119082 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118568 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         118398 gjames: RA-607 BCRYPT Improved the logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:17:10 +00:00
Jamal Kaabi-Mofrad
6f569467af ACE-4823: Fixed "list of a person's site memberships" REST API which only returned one of the two sites with identical titles.
- Also, fixed code standards.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 18:29:10 +00:00
Alan Davis
4b2179865b Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115549 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112033: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         111936: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111829: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111784: Merged DEV to V4.2.5 (4.2.5)
                  111783: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - Extended QueryLikeTest in order to create test data folder with temporary aspect.,
      112919: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112547 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112542: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111974: Merged DEV to V4.2.5 (4.2.5)
                  111967: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skipped deletion of test data,
      114016: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113902 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113818 abozianu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113605 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  113579: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skip deletion for test data for QueryForObject and QueryInFolderTest 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:17 +00:00
Alan Davis
114566a80e Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115475 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114837 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114758 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114713 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114616 abozianu: MNT-14994: CLONE - Alfresco Mobile: All Sites is throwing error when listing sites
                  - added unit tests
                  - ran all test cases in a single test to improve the testing time by using the same test data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:00 +00:00
Alan Davis
b1577072fc Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115466 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114587 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114483 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114306 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114282 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  114252: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - configured cmis tck timeout in tests property file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:11:44 +00:00
Jamal Kaabi-Mofrad
8855ef66f8 ACE-4469: Merged BRANCHES/DEV/HEAD-SFS (cherry picked) to HEAD
113520: SFS-179: Added multipart upload support into Public API framework.
   114561: SFS-179: Added tests for upload API, as well as minor fixes.
   114732: SFS-179: Changed the assert import from 3.X to 4.X.
   114734: SFS-179: Added unit tests for Public API framework multiPart support.
   114735: SFS-179: Fixed unit test failure.
- Also removed mergeinfo added in r112639

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 23:25:59 +00:00
Gethin James
54c5962983 Merge Sabre4 to HEAD
110682: Add ModulePackagesApiTest to the ApiTest suite RA-370


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:05:12 +00:00
Gethin James
3c0449ad18 Merge Sabre4 to HEAD
110681: Extract modulepackages as a constant RA-370


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:05:05 +00:00
Gethin James
8962c270e3 Merge Sabre4 to HEAD
110680: Tests for ModulePackages api endpoint RA-370, moved some CMM logic to AbstractBaseApiTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111189 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:04:56 +00:00
Gethin James
5711bad77a Merge Sabre4 to HEAD
110660: New ModulePackages api endpoint for RA-370


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111187 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:04:38 +00:00
Tatyana Valkevych
c8c2441ba3 Merged 5.0.N (5.0.3) to HEAD (5.1)
110205: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110092: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110055: Merged DEV to PATCHES/V4.2.5 (4.2.5)
            109047 : MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
               - Reimplemented previous solution. Configuration properties for autoVersioning should not affect all nodes in repo. They should just provide default behavior.
               - Added ability to specify default values for model properties using standard alfresco GLOBAL_PROPERTIES file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-21 16:42:09 +00:00
Jamal Kaabi-Mofrad
7ec60dc9c2 Merged DEV to HEAD
109455: Merged modules/custommodelmanagement/HEAD to DEV.
		93923: SHA-300: Added ALFRESCO_MODEL_ADMINISTRATORS group.
		95982: SHA-401: Implemented repo service for retrieving Custom Models. (WIP)
		95983: SHA-400: Added Private REST API to retrieve custom model(s)
			- Get All models: http://localhost:8080/alfresco/api/-default-/private/alfresco/versions/1/cmm
			- Get the model: http://localhost:8080/alfresco/api/-default-/private/alfresco/versions/1/cmm/<model-name>
		95984: SHA-401: Fixed the service to return null rather than throwing an exception, when the model does not exist.
		96053: SHA-400: Modified the custom model API response to return the "status" as "ACTIVE" or "DRAFT".
		96775: SHA-542: Added support to create a custom model. (WIP)
		96779: SHA-543: Added Private REST API to create custom model(s).
			- SHA-539: Cleaned up test data.
		96850: SHA-543: Added Author and Description properties to the custom model API.
		97410: SHA-407, SHA-555: Added tests for custom model backend service and the related REST API. Also, a minor modification as a result of added tests.
		97570: Modified the CMM REST API, per Kevin's request, to return empty arrays for model's types and aspects if they don't exist.
		97731: SHA-386: Added support to activate custom models. Also, a minor modification to the backend service and REST API, based on the Alfresco REST API guidelines.
		97775: SHA-386: Added tests for custom model activation (backend service). As well as, fixed the build failure by refactoring the public API tests.
		97992: SHA-573, SHA-393, SHA-494: Added support to deactivate custom model, create a new type and create a new property group (aspect).
		97994: Fixed the test as a result of renaming the service method.
		98123: SHA-393, SHA-494: Enabled the CMM REST API to create/update Types and/or Aspects via PUT. Also added validations for aspect/type's name.
		98259: SHA-453: Added backend and REST API support to delete a custom model.
		98690: SHA-393, SHA-494, SHA-453, SHA-575: Added tests for custom model backend service and the related REST API. Also, a minor modification as a result of added tests.
		99276: SHA-549: Added backend support to update a custom model. Also, refactored the service to externalise the error messages.
			- SHA-550: Added REST API support to update a custom model.
			- SHA-619: Made sure the backend service validates the model before creating a node. 
			- SHA-623: Added checks to not allow a user to create a custom model with the same name as the bootstrapped models.
		99287: SHA-619: Added InvalidCustomModelException for the CMM service to throw when the model validation fails.
		99514: SHA-506: added backend and API support to create custom Type/Aspect properties. Also refactored the API to overcome the Public API limitations.
		99522: SHA-506: Modified the Type/Aspect JSON payload to include a new read only property "prefixedName".
		99527: Fixed Bamboo build failure as the result of r99522 commit.
		99630: SHA-506: - Updated the API to exclude the inherited properties.
			- Added API tests for creating properties.
			- Modified the Custom Properties JSON response to include a new read only attribute "prefixedName".
                99662: SHA-351: Updated the API to support 'mandatory' and 'mandatoryEnforced' properties.
			- SHA-410: Updated the API to support 'defaultValue' property.
			- SHA-506: Modified the Custom Properties JSON response to include 'description' and 'multiValued' attributes.
		99669: SHA-506: Removed the unnecessary (at least in this sprint) methods from the backend service.
		99684: SHA-638: Added checks to not allow a user to create a custom model with already in-use namespace prefix.
		99959: SHA-679: Modified the custom model API to not import the already defined namespace.
		100211: SHA-607: Modified the custom model API to support delete model's type. Also, removed the unnecessary test as we depend on the dictionary service, so no need to test it in the custom model API.
		100281: Added Types and Aspects to the GET a single model API response, when it is requested with "?select=all" query string.
		100335: Added test for "?select=all" query string within the GET a single model API (see rev 100281).
		100366: SHA-612: Modified the custom model API to support delete model's aspect.
		100738: SHA-698: Added checks so the model Admin is not allowed to deactivate a custom model when its types/aspects are parent to other models' types/aspects (regardless of the model being active or not).
		100740: SHA-698: Fixed Bamboo build failures.
		101085: SHA-703: Added dependency validation before deleting custom type/aspect in the custom model API.
		101160: Modified the custom model API to return all properties (including the inherited properties) of the type/aspect, when requested by "?select=allProps".
		101636: SHA-697.
		101771: SHA-706: Made custom models hidden in the data dictionary.
		101863: SHA-701: Added checks to not allow creating duplicate properties within the same model. Also, removed unnecessary/duplicate constants from the custom model service class.
		101983: SHA-688: Fixed the error message by getting the root-cause-exception and returning its message. However, DictionaryException messages are not localised, so this will be fixed in the alfresco core.
		102223: Fix for SHA-726: Not able to edit prefix field of deactivated model when model type is referenced within same model - The API will update the parent prefixed name with the new prefix.
			- Also, added more validations to the CMM API, when setting a type/asptect's parent.
		102587: SHA-741, SHA-745, SHA-747: Added custom model Constraints support.
		102725: SHA-784: Fixed parent validation of the type/aspect.
		103030: SHA-741, SHA-745, SHA-747: Added tests for custom model Constraints.
			- Also fixed and refactored the API code as the result of tests.
		103753: SHA-846: Added inline constraints support. Also:
			- Modified the backend CMM service to throw CustomModelConstraintException when the root cause is DuplicateDefinitionException.
			- Removed the duplicate name check from the CMM API, as now it will depend on the exceptions thrown upon model compilation.
		103885: SHA-819, SHA-833: Added support to edit existing type/aspect.
		103973: SHA-819, SHA-833: Added API tests for types/aspects Edit. Also, refactored CMM API tests by moving the tests to their corresponding test class.
		104079: SHA-808: Fixed custom models bidirectional dependency.
		104158: Deleted the ExtendedRepoAdminService class as the required functionality has been added (see SHA-879) to the core alfresco code.
		104287: SHA-843: Modified the custom model API to support delete property. Also, minor refactoring of the API tests.
		104403: SHA-842: Modified the custom model API to support Edit property.
		104475: SHA-842: Added API tests for Edit property.
		104569: SHA-913 - Remove case sensitive option from the UI
			- SHA-914 - Update PO and tests that use the case sensitive option
			- Remove case sensitive option on LIST constraint throughout
			Also:
			- Update Aikau version to 1.0.18
		104690: Fixed Bamboo build failure caused by r104569.
		104849: SHA-808: Fixed custom models circular dependencies.
		105297: SHA-807: Added property default-value and constraint (REGEX, MINMAX and LENGTH) validators.
		105642: SHA-950: Wrapped backend CMM service method with a NEW transaction, in order to catch the thrown exception within DictionaryModelTypeTransactionListener. Also refactored the CMM backend service tests as the result of this change.
		106677: SHA-888, SHA-889, SHA-890: Added Backend and API support to export a custom model and its associated Share form.
		106722: SHA-888, SHA-889, SHA-890: Fixed a few minor issues raised during code review.
		107007: ACE-4019: Modified the CMM service to not start a new TX when creating a new model.
		107070: Temporarily enabled (hard coded) index and facetable attributes in the custom model properties.
		107296: GERMAN: Model Manager files localised as per EN-rev105921
		107297: FRENCH: Model Manager localised files based on EN-rev105921
		107315: SPANISH: Model Manager localised files based on EN-rev105921
		107317: JAPANESE: Model Manager localised files based on EN-rev105921
		107321: ITALIAN: Model Manager localised files based on EN-rev105921
		107322: DUTCH: Model Manager localised files based on EN-rev105921
		107335: SHA-889: Modified the CMM service to not throw an exception when exporting the model and its associated share extension module, where the Share extension module has not been created for the model yet.
		107456: SHA-893: Added API support to upload/import a custom model and its associated Share extension module.
		107560: SHA-893: Added model upload API tests as well as minor fixes.
		107647: SHA-893: Fixed minor issues raised during code review.
		107773: Docs review of message labels and errors.
		107866: SHA-1126: Added check for the maximum value of the MINMAX constraint to be a positive nonzero value.
		108117: SHA-832: Added validation for properties' default values to be checked against the property defined constraint.
		108256: SHA-1194: Modified CMM API to support indexing options.
		108510: SHA-1151: Externalised CMM rest API error messages.
			- SHA-1196: Changed the CMM Rest API input validator to use the same RegExs as the CMM Share.
		108518: SHA-1194: Changed CMM property facetable options to include "UNSET".
		108561: GERMAN: Model Manager files updated as per EN-rev107962
		108562: FRENCH: Model Manager files updated as per EN-rev107962
		108565: ITALIAN: Model Manager files updated as per EN-rev107962
		108566: SPANISH: Model Manager files updated as per EN-rev107962
		108567: JAPANESE: Model Manager files updated as per EN-rev107962
		108568: NORWEGIAN Bokmal: Model Manager files updated as per EN-rev107962
		108570: DUTCH: Model Manager files updated as per EN-rev107962
		108571: RUSSIAN: Model Manager files updated as per EN-rev107962
		108572: BRAZILIAN Portuguese: Model Manager files updated as per EN-rev107962
		108573: SIMPLIFIED CHINESE: Model Manager files updated as per EN-rev107962
		108604: Removed the unnecessary escaped quotation from the strings which don't have variables.
		108721: Api message changes from docs.
		108728: Changed "Property group" to "Aspect" in the CMM API error messages.
		108934: Added the missing escaped quotation into API messages.
		109037: Changes from docs for mandatory field character messages in the API.
		109204: ITALIAN: Updated bundle based on EN rev109039
		109205: GERMAN: Updated bundle based on EN rev109039
		109206: FRENCH: Updated bundle based on EN rev109039
		109223: GERMAN: Updated bundle based on EN rev109039 - fixed single quotes
		109226: FRENCH: Updated bundle based on EN rev109039 - fixed single quotes
		109228: ITALIAN: Updated bundle based on EN rev109039 - fixed single quotes
		109230: FRENCH: Updated bundle based on EN rev109039 - fixed single quotes again
		109235: JAPANESE: Updated bundle based on EN rev109039
		109293: SPANISH: Updated bundle based on EN rev109039
		109300: DUTCH: Updated bundle based on EN rev109039
		109412:	- Refactored the CMM JMX support to return CompositeData for performance reasons.
			- Reorganised a few of CMM classes/interfaces to make it easier for merging to alfresco core.
			- A minor fixes as a result of Find Bugs analysis.
			- Added the minimum and maximum repo versions for CMM module.
		109421: NORWEGIAN: Updated bundle based on EN rev109039
		109424: BRAZILIAN PORTUGUESE: Updated bundle based on EN rev109039
		109426: RUSSIAN: Updated bundle based on EN rev109039
		109427: CHINESE: Updated bundle based on EN rev10903
   109475: Added CMM Model into the core services (missed from previous commit).
   109480: SHA-723: Added custom models analytics in HeartBeat data.
   109481: SHA-528: Added GROUP_ALFRESCO_MODEL_ADMINISTRATORS_AUTHORITY patch.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-04 01:56:12 +00:00
Alan Davis
9ff9cb23f0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108206: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108191: MNT-13057 : Problem when using CMIS and with document names containing %
         - Fixed build failure for 5.0.N.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-14 07:03:27 +00:00
Alan Davis
4bfbc7e5f9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108203: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108157: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         108115: Merged DEV to V4.2-BUG-FIX (4.2.5)
            107373 : MNT-13057 : Problem when using CMIS and with document names containing %
               - Updated some code, was added unit test.
            107742 : MNT-13057 : Problem when using CMIS and with document names containing %
               - Changed the logic that checks whether uri is cmis uri to be more specific.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-14 07:02:53 +00:00
Alan Davis
c657b2825a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108038: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107601: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         107332: Merged DEV to V4.2-BUG-FIX (4.2.5)
            105981 : MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
               - Added config for upload.post.js webscript. So now users may configure versioning for Share APP separatelly.
            106157 : MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
               - Updated previous solution so that if no config provided for upload.post.js webscript then default model versioning strategy used.,
         107537: MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
            - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108069 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:09:30 +00:00
Tatyana Valkevych
22d2935235 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Alan Davis
b98c2dc6b0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105374: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105132: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         104888: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104492: MNT-10962: Versioning for cmis:document not working initially
               - Use default values in the content model for autoVersion.
               - Test to ensure that version properties for node created via CMIS are set wrt contentModel.
               - TCK is now run with autoVersion=false.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-03 09:00:06 +00:00
Tatyana Valkevych
c70953278a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104025: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103975: MNT-13938: Public API does not set any HTTP caching headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-13 16:25:31 +00:00
Tatyana Valkevych
5df0a574c2 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101658: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101404: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
            100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
               - Added init-method for CMISConnector. Test is added,
      101597: Merged DEV to 5.0.N (5.0.2)
         101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
            - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 21:18:10 +00:00
Tatyana Valkevych
1675fee3b5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101647: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101286: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         100798: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case using jetty


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 21:03:26 +00:00
Tatyana Valkevych
bc13977b7d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101331: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100711: RA-86, RA-87 & RA-88 (sub-tasks of RA-56): Move wiki service back-end classes to share services project.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:23:14 +00:00
Alan Davis
1d16fa63ab Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100265: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100257: Reverse Merge 5.0.N (5.0.2)
         << Cause 4 build errors >>
         100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
            99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
               - Filter inherited permissions before try to remove them
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:16:14 +00:00
Alan Davis
64910942ed Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100243: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:14:56 +00:00
Alan Davis
6ae2064bfe Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
d47f8618ad Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94326: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94249: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         94198: MNT-12956: Merged DEV to V4.2-BUG-FIX (4.2.5)
            94044: MNT-12956: Querying secondary objectTypes like Aspects towards 1.1 CMIS endpoint fails with: Invalid column for cmis:document cmis:secondaryObjectTypeIds
               - For Solr configure search.OpenCMISQueryService1.1 to use OpenCMISDictionaryService1.1. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95074 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:38:44 +00:00
Alan Davis
9762aeb94f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93587: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93514: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93316: Merged DEV to V4.2-BUG-FIX (4.2.5)
            93033 : MNT-13093 : Users cannot add Comments to any documents in Alfresco via Alfresco Mobile App.
               - Include subTypes of desired type to expectedTypes
            93140 : MNT-13093 : Users cannot add Comments to any documents in Alfresco via Alfresco Mobile App.
               - TypeConstraint is changed to check for subClass on demand. Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:27:54 +00:00
Alan Davis
0732cc642c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91710: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91606: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         << Merging only new CMIS >>  
         91469: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            91306: Merged DEV to PATCHES/4.2.4
               91267 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
                  - Escaping of control characters was added
               91286 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
                  - Added tests to check incorrect char in description property of node.
         91470: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            91313: MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
               - Build failure fixed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:37:48 +00:00
Alan Davis
9f84dc7c72 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91358: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      91138: Merged DEV to V4.2-BUG-FIX (4.2.5)
         91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
            - Extracting "creationDate" property via filter, like in v3.4
      91139: MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
         - Reverted "merge" to incorrect branch
      91260: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5) (RECORD ONLY)
         91156: Merged DEV to V4.2-BUG-FIX (4.2.4)
            91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
               - Extracting "creationDate" property via filter, like in v3.4
      91264: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5) (RECORD ONLY)
         91181: Reverse Merged V4.2-BUG-FIX (4.2.5) to V4.2.4 (4.2.4)
            91156: Merged DEV to V4.2-BUG-FIX (4.2.4)
               91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
                  - Extracting "creationDate" property via filter, like in v3.4
            91161: Merged DEV to PATCHES/4.2.4
               91109 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
                  - Escaping of control characters was added
               90723 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
                  - Added tests to check incorrect char in description property of node.
      91342: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
         91254: Merged DEV to PATCHES/4.2.4
            91232 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
               - Extracting "creationDate" property via filter, like in v3.4


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:22:28 +00:00
Alan Davis
fd35b41a99 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
89523: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      89431: MNT-12242: Merged V4.2.3 (4.2.3.6) to V4.2-BUG-FIX (4.2.4)
         << Still requires more unit tests to be added >>
         89177: MNT-12622 : Merged DEV to PATHCES\V4.2.3 (4.2.3.6)
            83657 : MNT-12242 : Alfresco "autoVersionOnUpdateProps=false" does not work properly when making a CMIS call
               - Do not create version on CMIS update properties explicitly
         89184: MNT-12622 : CLONE - Alfresco "autoVersionOnUpdateProps=false" does not work properly when making a CMIS call
            - Create MAJOR version on content update if autoVersion==true
         89236: MNT-12622 : CLONE - Alfresco "autoVersionOnUpdateProps=false" does not work properly when making a CMIS call
            - Create MINOR version on content update if autoVersion==true
         89258: MNT-12622 : CLONE - Alfresco "autoVersionOnUpdateProps=false" does not work properly when making a CMIS call
            - Correcting comment to match to the actual behaviour


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:40:34 +00:00
Steven Glover
88eb6abecc ACE-3433 "Alfresco 5.0b mt cannot authenticate mobile users"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@90269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-11 17:33:00 +00:00
Alan Davis
80aab65e53 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
87390: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      << SteveG requested these commist be merged to HEAD >>
      87255: ACE-2928 : Secondary Type id "P:sys:localized" is invalid
      Re-instated the sys:localized aspect, deleted in r80397.
      87367: ACE-2928 : Secondary Type id "P:sys:localized" is invalid
      Removed unnecessary check in the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-07 13:54:45 +00:00
Pavel Yurke
67830a004e Merged DEV to HEAD (5.0)
86271 : ACE-2960 : getRepositories service no longer works for the atom pub binding
      - Do not change -default- to blank string
   86300 : ACE-2960 : getRepositories service no longer works for the atom pub binding 
      - Return reqQueryString if networkId not specified. Test extended with 1.0 and 1.1 versions and browser binding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-03 07:15:28 +00:00
Alex Mukha
10f1d71f6e Merged DEV (5.0.0.BF) to HEAD (5.0/Cloud)
85527: ACE-2355 : Can't access sites' of Cloud networks other than 'alfresco.com' on Android mobile device with Alfresco mobile app
   Added repositoryId as an url parameter for CMIS requests.
   85721: ACE-2355 : Can't access sites' of Cloud networks other than 'alfresco.com' on Android mobile device with Alfresco mobile app
   Implemented a test to simulate the issue.
   85759: ACE-2355 : Can't access sites' of Cloud networks other than 'alfresco.com' on Android mobile device with Alfresco mobile app
   Extended the test to use both 1.0 and 1.1 end points.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-26 08:30:15 +00:00
Alan Davis
485794202c ACE-2780: Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85506: Merged DEV to HEAD-BUG-FIX (5.0/Cloud)
      85436 : ACE-2780 : TestActivities test never ends
         - Change transaction handling for multi-threaded feed generation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85532 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:10:59 +00:00
Alan Davis
b6c5846e81 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83801: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83800: MNT-11123: Test failure in TestEnterpriseAtomPubTCK
         - Comment out test as Steven Glover does not have time to look at it.
           JIRA has been open for 1 year. Issue is still assigned to him to fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:14:16 +00:00
Alan Davis
01aba183d1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83757: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      << Bringing back the commit just reverted. Needed to revert another commit
         80358 which changed pom.xml files to include the correct versions of
   	  external libs including open cmiss 0.11 >>
      80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
         << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
         80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
            << And added alfresco-opencmis-extension 1.0 >>
            79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
               << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
                  rather than the changes from V4.2-BUG-FIX >>
               79166: Reverse merged V4.2-BUG-FIX (4.2.4)
                  << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                     and Steve is on holiday for a week. >>
                  << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
                  79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                     67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                        Updated OpenCMIS to 0.11 version.
                  79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                     79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            79166: Reverse merged V4.2-BUG-FIX (4.2.4)
               << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                  and Steve is on holiday for a week. >>
               << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
               79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                  67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                  Updated OpenCMIS to 0.11 version.
               79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                  79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
         80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
         80814: MNT-11223: Fix build (pt1)
            - 80366: pom.xml contained a reference to an external surf which is now back in house.
         80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
         80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
         80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
         80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Changed Solr to Lucene for tests.
      83745: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         83699: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) VIA EOL
            81016: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS to check for secondary types list to be null.
            81017: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Disabled assert for tests run by maven.
            82255: Merged V4.2-BUG-FIX (4.2.4) to EOL (5.0/Cloud)
               82252: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Disabled QueryRootFolderTest.
            - RECORD ONLY merge from V4.2-BUG-FIX extra commits not required on HEAD-BUG-FIX: 80373,80397,80840-80841,81707,81741,82245


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:13:46 +00:00
Alan Davis
3ec6b5b747 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83663: ALF-21093 Remove dependency to Apache Axis - it was only used for a util class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:12:10 +00:00
Erik Winlof
22be126dec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
      << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
      80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         << And added alfresco-opencmis-extension 1.0 >>
         79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
               rather than the changes from V4.2-BUG-FIX >>
            79166: Reverse merged V4.2-BUG-FIX (4.2.4)
               << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                  and Steve is on holiday for a week. >>
               << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
               79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                  67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                     Updated OpenCMIS to 0.11 version.
               79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                  79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
      80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         79166: Reverse merged V4.2-BUG-FIX (4.2.4)
            << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
               and Steve is on holiday for a week. >>
            << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
            79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
               67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Updated OpenCMIS to 0.11 version.
            79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
               79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
      80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
      80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
      80814: MNT-11223: Fix build (pt1)
         - 80366: pom.xml contained a reference to an external surf which is now back in house.
      80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
      80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
      80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
      80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Changed Solr to Lucene for tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:01:21 +00:00
Will Abson
cf79281a30 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
      Changed Solr to Lucene for tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:06:52 +00:00
Erik Winlof
fb3b0543ae Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78782: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78471: Merged dev. V4.2-BUG-FIX-2014_06_06 to V4.2-BUG-FIX (4.2.4)
         73309: MNT-11631: CMIS property isPrivateWorkingCopy not set for the checked out object
           - Property value accessor for 'cmis:isPrivateWorkingCopy' has been implemented. This property is introduced in CMIS 1.1
      78473: MNT-11631: CMIS property isPrivateWorkingCopy not set for the checked out object
         Test for 'cmis:isPrivateWorkingCopy' has been added into 'org.alfresco.rest.api.tests.TestCMIS'. Also this test class has been a bit refactored


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:55:12 +00:00
Erik Winlof
eb6e5e1ff0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78437: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76188: ACE-2149: EOL AVM / WCM
       - Force a type exclusion (act:actionbase) in order to test CMIS type exclusions
       - Originally, all wcm prefixes were ignored and that had been used by the CMIS exclusion test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:15:25 +00:00
Erik Winlof
0546224e23 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Will Abson
c84f6847dd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73882: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73714: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73713 : MNT-11688 : Class cast exception when parsing preferences in Test Code.
            - Use Object.toString() for value to prevent Class cast exception


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:11:18 +00:00
Alan Davis
c89bee1ff4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69761: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69649: Merged DEV to V4.2-BUG-FIX
         69604: MNT-11378: Intermittent test failures: ProcessWorkflowApiTest and TaskWorkflowApiTest
          - Add logging to find out cause of failing on bamboo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:43:48 +00:00
Mark Rogers
2d3ff34928 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68109: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65860: MNT-10430 "CMIS: NPE getting mandatory aspects with browser binding"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:06:24 +00:00
Mark Rogers
bb6f6e619e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68108: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65761: MNT-10430 "CMIS: NPE getting mandatory aspects with browser binding"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68396 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:06:04 +00:00
Alan Davis
71cdbe8445 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65434: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65008 : MNT-10551 : PUT sites/<siteId>/members/<personId>
            - Throw InvalidArgumentException if the person is not site member
         65046 : MNT-10551 : PUT sites/<siteId>/members/<personId>
            - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:48:02 +00:00