Commit Graph

5649 Commits

Author SHA1 Message Date
Tatyana Valkevych
188e1ac194 Merged 5.0.N (5.0.3) to HEAD (5.1)
111037: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110885: MNT-14532: Revert changes for MNT-14474 and MNT-12849: Merged V4.2.2 (4.2.2.24) to V4.2-BUG-FIX (4.2.6): Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110477: MNT-14532 : Revert changes for MNT-14474 and MNT-12849
            -reverted revision 93098 done for MNT-12849 My Sites public API is not returning the expected list of sites


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-28 13:18:41 +00:00
Andrew Hind
2c250be45b Fix for ACE-2004 SOLR 4 - Support filtering of query results
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111060 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-27 20:35:23 +00:00
Tatyana Valkevych
271ce04935 Merged 5.0.N (5.0.3) to HEAD (5.1)
110822: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110619: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110422: Merged DEV to V4.2.5 (4.2.5)
            110332: MNT-14151 : CMIS Upload/Create in 4.2 adds the sys:hidden and cm:indexControl Aspect to documents starting with a period
               - added system property in order to enable/disable cmis hidden behavior
               


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 13:42:25 +00:00
Tatyana Valkevych
5814865fc8 Merged 5.0.N (5.0.3) to HEAD (5.1)
110768: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110604: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         110200: Merged DEV to V4.1-BUG-FIX (4.1.11)
            109557: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
               - Caching mechanism for the actions' parameters labels has been implemented. Labels for action's parameters will be loaded into RAM for the configured set of locales for each parameter of each definition of the action. Affected tests have been changed.,
         110327: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
            - Changed locale setting to fix build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 13:11:16 +00:00
Ray Gauss
3550148307 Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
106201: SHA-1021: Add Leave Site Link to Email Template
     - Added siteLeaveLink to properties for email generation in InviteSender
     - Added link and styling to email template
     - Updated InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:03:06 +00:00
Ray Gauss
d04367fc9c Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
106196: SHA-993: Create Site Link in Email
     - Modified InviteSender to add siteDashboardLink as a property being sent to the email generation
     - Updated email template with siteDashboardLink
     - Updated InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:02:29 +00:00
Ray Gauss
39a3ac65fd Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
105365: SHA-957: Create New Email Template
     - Changed InviteHelper and InviteSender methods to accept emailTemplateXpath and emailSubjectKey rather than using hardcoded defaults
     - Changed existing email send delegates to declare their respective emailTemplateXpath and emailSubjectKey
     - Added SendNominatedInviteAddDirectDelegate with new emailTemplateXpath and emailSubjectKey
     - Added SendNominatedInviteAddDirectDelegate bean definition
     - Added localization messages for subject and space
     - Changed sendInvite in workflow to use SendNominatedInviteAddDirectDelegate
     - Updated InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:01:33 +00:00
Ray Gauss
f5ef093331 Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
105178: SHA-935: Repository Invite Flow Changes
     - Updated remote-api tests
     - Additional logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:01:05 +00:00
Ray Gauss
aee14f6158 Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
105016: SHA-935: Repository Invite Flow Changes
     - Added new invitation-add-direct.bpmn20.xml workflow
     - Added bootstrapping of new workflow
     - Changed InvitationServiceImpl to allow setting of workflows used
     - Added configuration of workflows used in invitationService bean
     - Added repository properties for default workflows
     - Changed InvitationServiceImpl.getWorkflowDefinition to take an enum argument
     - Changed abstract testNominatedInvitationExistingUser to accommodate both current and new invite flows
     - Added test of new flow to Activiti test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:00:26 +00:00
Tatyana Valkevych
10e4c81087 Merged 5.0.N (5.0.3) to HEAD (5.1)
110341: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110159: MNT-14392 - Adding debug log to ActivitiWorkflowEngine,
      110160: MNT-14392 more debug logging.,
      110199: MNT-14392 - Missed check in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-21 17:07:44 +00:00
Tatyana Valkevych
9cdc1f1377 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
5e0d90bb8d SHA-1308: Added check to prevent an unindexed property to be included in the facetable property list. Also, added faceted search tests into their dedicated test suite and refactored SolrFacetQueriesDisplayHandlersTest to not rely on the bootstrapped swsdp site.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-20 17:26:09 +00:00
Tatyana Valkevych
b8c759ab9e Merged 5.0.N (5.0.3) to HEAD (5.1)
110091: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      110076: Code standards


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 11:48:29 +00:00
Tatyana Valkevych
17d4505ed3 Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)
110090: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      110075: Fix to cover MNT-14463 and MNT-14546
       - RM now works
       - The basic dictionary (classpath xml files) are loaded in the first phase as before,
         however, after the listeners have been registered, we now force an immediate, on-thread
         refresh in order to get the full model list from the repo immediately while still
         having the basic dictionary available for subsystems
       - Cleanup of code in DictionaryDAOImpl
       - Javadoc to make things clearer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 11:48:04 +00:00
Tatyana Valkevych
e11febd09e Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)
110088: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      110052: MNT-14579: TS starting in read-only mode after applying 5.0.2 build 64
       - This intermittent issue was probably caused by the SysAdminParams.afterPropertiesSet
         checking for a valid dictionary.  If this call took place too early, then it would
         never allow the system to be in read-write mode unless rebooted.
       - Removed the dictionary check from SysAdminParamsImpl; it is now only responsible for the 'server.allowWrite' property
       - Call the TransactionServiceImpl's read-write veto code if the 'server.allowWrite' property changes
       - Better logging when vetoes are placed but also when vetoes are removed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 11:47:37 +00:00
Tatyana Valkevych
c7e7ff3fef Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)
110087: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      110048: MNT-14554 : 5.0.2 - Node-Details
         - added incompatible_improvements setting to version 2.3.20 to all FreeMarker Configurations
         - this will tell free marker to escape all ?html as ?xhtml
         - added more validation code: ?html to alfresco-macros.lib.ftl   


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 11:45:13 +00:00
Gethin James
2a8ce1fdfc RA-505 Expose all public API services via ServiceRegistry
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 11:31:07 +00:00
Alex Mukha
f7b86ad94b Merged DEV to HEAD (5.1)
110000: MNT-13836: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Changed class policies enabled/disabled checks. Now each behaviour at a given level must be explicitly disabled & re-enabled (unless all behaviours are disabled in the transaction).
      - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-14 09:16:26 +00:00
Alan Davis
734bcdd99b Merged 5.0.N (5.0.3) to HEAD (5.1)
110010: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      109966: SysAdminParams INFO logging when setAllowWrite is changed to 'false' (MNT-14579)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-13 08:00:22 +00:00
Alan Davis
f00b22bbbf Merged 5.0.N (5.0.3) to HEAD (5.1)
110009: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      109965: Code style fixes in prep for MNT-14579


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-13 08:00:13 +00:00
Alan Davis
18febb4fdf Merged 5.0.N (5.0.3) to HEAD (5.1)
109927: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      109904: MNT-14463: Deadlock during startup
       - DictionaryDAO refinements for destroy, init and reload; includes javadoc on API
       - Proper sequence for custom repo-based models:
         - Destroy dictionary and force synchronous reload of basic models (reload)
         - Register listeners
         - Force async reload of dictionary (init), which does the repo-based loading of models


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-12 08:40:15 +00:00
Alan Davis
987808385e Merged 5.0.N (5.0.3) to HEAD (5.1)
109818: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      109757: Merged DEV to V4.2-BUG-FIX (4.2.6)
         101864 : MNT-13817 : Request to join moderated site workflow overwriting site role manually set by administrators
         109516 : MNT-13817 : Request to join moderated site workflow overwriting site role manually set by administrators
            - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-10 07:43:45 +00:00
Alan Davis
bbf8fa3862 Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)
109754: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      109744: MNT-14507: Freemarker template
         - added change for all freeMarker configs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-08 08:02:04 +00:00
Alan Davis
f7e3dc7e6c Merged 5.0.N (5.0.3) to HEAD (5.1)
109729: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      109705: MNT-14463: Deadlock during startup
      DictionaryDAO: Remove side-effect code in:
       - DictionaryRepositoryBootstrap.register: Now it only registers listeners rathern than destroying and rebuilding the dictionary
       - DictionaryDAOImpl.removeDictionaryRegistry: Now it only removes the dictionary rather than removes and reinitialized
      DictionaryRepositoryBootstrap.onBootstrap:
       - RESETS the dictionary (destroy, reinitialize)
       - Then registers listeners
       - Then fires application events
      The stacks and logs for the deadlock show that the dictioanary bootstrap was triggering a background reload
      and then firing the application events without checking that the dictionary had loaded.  The events will now
      only be fired once the dictionary has successfully retrieved an instance i.e. no other code will need to wait
      for the background thread after the reset has finished.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-08 08:01:06 +00:00
Alan Davis
009d4ff6d1 Merged 5.0.N (5.0.3) to HEAD (5.1)
109438: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      109264: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         109214: Merged DEV to V4.2.5-PATCHES
            109105: MNT-14452: Permissions not amended correctly when changing a site from private to public
              - Return inheritance to the site containers when site becomes public.  
            109213: MNT-14452: Permissions not amended correctly when changing a site from private to public
              - Unit test for change visibility


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-08 07:59:52 +00:00
Andrew Hind
61f041bea4 Fix for ACE-4075 SOLR 4 - sharded - default facet refinement reduces performance
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109683 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-06 13:20:48 +00:00
Gethin James
a93b1c9120 Adjusting the working for RA-545
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109671 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-06 11:25:33 +00:00
Derek Hulley
0a1c57a07e Fixed tabs during review
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-05 11:02:28 +00:00
Alan Davis
d16d3c4516 Merged 5.0.N (5.0.3) to HEAD (5.1)
109499: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      109403: Merged DEV to V4.2-BUG-FIX (4.2.6)
         109221 : MNT-12819 : InvalidNodeRefException - Node does not exist, if you call RuleService.removeAllRules(Node) for a folder which has INBOUND rules and OUTBOUND rules.
            - Added a check for existence of rule


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-05 07:58:59 +00:00
Jamal Kaabi-Mofrad
2d21700775 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
bcd68f5acf Merged 5.0.N (5.0.3) to HEAD (5.1)
109261: Merged DEV to V5.0.N
      109258: MNT-14233: Evaluator for linkedNode doesn.t work.
        - Add new method that return JSONObject and use it for "linkedNode" property.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-03 08:40:07 +00:00
Mark Rogers
db4195196d Merge WOLF-1 to HEAD
EOL-2 : Remove NFS

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-29 16:57:14 +00:00
Tatyana Valkevych
ce1922480b Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud)
109077: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      108983: MNT-9839: CMIS TCK Failures: Fix for hundreds of warnings regarding missing ACL exact flag in atom binding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-29 10:56:47 +00:00
Matt Ward
bd727cfa84 ACE-4063: Typo in the message when a module upgrade is being forced
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-28 08:39:00 +00:00
Alan Davis
62f870a75b Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud) (PARTIAL MERGE)
108623:       Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            108582: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               108580: Reverse merged V4.2.5 (4.2.5)
                  << Also removing from 4.2.5, 4.2.N, 5.0.N, 5.1. Has already been removed from 5.0.2 >>
                  97973: Merged NESS/4.2.N-2015-02-10 (4.2.5) to V4.2-BUG-FIX (4.2.5)
                     97883: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more
                        - added check on task status in workflow/TaskFormPersister.java;
                        - added localization for the error message in workflow/workflow-messages.properties;
                        - added js condition to display a friendly error message in alfresco.js
                     97924: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-22 08:54:27 +00:00
Alan Davis
01d3791d72 Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud)
108605: MNT-14413: Merged 5.0.1 (5.0.1.4) to 5.0.N (5.0.3)
      108254: MNT-14366 : Re-created user does not have access to his existing workflows
         - get owner property from initiatorhome nodeRef if initiator nodeRef no longer exists,
      108318: MNT-14366 : Re-created user does not have access to his existing workflows
         - fix for failed tests,
      108467: MNT-14366 : Re-created user does not have access to his existing workflows
         - test to check functionality is working 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-21 06:31:08 +00:00
Alan Davis
4db208e306 Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud) (PARTIAL MERGE)
108522: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      108469: Merged DEV to V4.2-BUG-FIX (4.2.5)
         108349: MNT-12361 : CIFS reports wrong usage with system.usages.enabled=true
            - Made changes to report the correct usages when user quota is enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-18 08:45:31 +00:00
Alan Davis
9441ab7bd9 Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud)
108512: Merged DEV to 5.0.N (5.0.3)
      107232: MNT-14195 : Replication Jobs: An error is thrown every time that a scheduled job should be run if it was disabled
      108319: MNT-14195 : Replication Jobs: An error is thrown every time that a scheduled job should be run if it was disabled
         - added tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-18 08:45:23 +00:00
Alan Davis
e5dc02a8c1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108293: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108286: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         108236: Merged /NESS/5.0.2-2015_07_13 (5.0.2) to URL: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.0.2 (..)
            108185: MNT-14370 : Cannot delete a folder through FTP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-15 17:12:59 +00:00
Alan Davis
60451f01f8 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108276: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108214: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         108154: Merged DEV to V4.2-BUG-FIX (4.2.5)
            107925 : MNT-14140 : MAIL command with a null reverse-path causes java.lang.NullPointerException
               - Allowed null reverse-path, added some tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-15 17:12:38 +00:00
Alan Davis
1458c2dbcf Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108207: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108196: Merged DEV to 5.0.N (5.0.3)
         108195: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
            - New and improved fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-14 07:03:41 +00:00
Alan Davis
f13dc0a415 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108205: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108186:       Reverse merged 5.0.N (5.0.3)
               << Better solution found >>
               106968: Merged DEV to 5.0.N (5.0.3)
                  106962: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
                     - Implemented fix for Transformations (JodConverter), FTP, SMTP and IMAP.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-14 07:03:15 +00:00
Alan Davis
8b4a283ba0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108046: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107741: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Fix automatic merge error in 107731 - compile fails.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:13:16 +00:00
Alan Davis
d2742fc893 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108045: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107732: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107703: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Fix up hanging test
         Tidy up imports


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:54 +00:00
Alan Davis
62d972f622 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108044: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107731: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107679: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Use the database to check if model is in use, rather than Search
         Fix up existing tests in light of these changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:29 +00:00
Alan Davis
0b09d68864 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108043: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107697: Merged DEV to 5.0.N (5.0.3)
         107623: MNT-14125: Errors related to sizeCurrent property.
            - Update actual_type_n and persisted_type_n to 3 (stands for long type) of cm:sizeCurrent properties which have invalid 0 types


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108074 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:02 +00:00
Alan Davis
3fd4104605 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108042: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107695: Merged NESS/5.0.N-2015_06_24 (5.0.2) to 5.0.N (5.0.3)
         107402: MNT-14275 - fixed the case where a Location with no path was provided when importing using UUID update
            - added a test case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108073 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:10:59 +00:00
Alan Davis
38a97282c6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108041: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107608: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         107462: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            107375: Merged DEV to V4.1-BUG-FIX (4.1.11)
               100814 : MNT-13719: CLONE - Comments' counter is working incorrectly after reversion major version of the uploaded document.
                  - Always restore forum properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:10:37 +00:00
Alan Davis
b34aaa4cfe Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108039: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107604: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         107379: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100688 : MNT-13713 : row.getValue() returns null when indexing with lucene and sort is applied.
               - Was implemented some code for query with sorting.
            107250 : MNT-13713 : row.getValue() returns null when indexing with lucene and sort is applied.
               - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:09:53 +00:00
Alan Davis
65aa48b800 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