Commit Graph

307 Commits

Author SHA1 Message Date
Tom Page
d24a22264c Merge release/V2.4 into release/V2.5. 2016-10-28 13:31:20 +01:00
Tom Page
eb00635594 Merge merge-2.4/MNT-16852_HF_2.2.0.2_Merge into release/V2.4. 2016-10-28 09:31:09 +01:00
David Webster
1bc282f2f5 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Tom Page
121381a384 Fix very minor issue with Javadoc strings. 2016-10-25 16:09:48 +01:00
Tom Page
3604820810 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-25 10:28:13 +01:00
David Webster
348128ef58 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
roxana
4f1ccefae2 I've tweaked the tests a bit to handle daylight savings.
(cherry picked from commit 4aa3909035df63537ea17b101117394250225960)
2016-10-24 14:40:08 +01:00
roxana
bac0622ce0 Added null check
(cherry picked from commit 72dec6f5ef58ab5d64e49e2c2e7d00a1b198354a)
2016-10-24 14:39:32 +01:00
roxana
72a7501d5e When the last step of the current disposition is completed, no more calculation is needed.
(cherry picked from commit 606e91545c0725b5523770b1c3cb1cffd38c0ce0)
2016-10-24 14:39:27 +01:00
roxana
9c5d0283cf Checking if disposition as of date was changed manually.
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
2016-10-24 14:39:22 +01:00
Tom Page
0b52d1bd73 RM-3386 Merge commit '48a65f5' into merge-2.4/RM-2526_BlendedDispositionSchedules. 2016-10-21 11:03:36 +01:00
Tom Page
970d1080e2 RM-2526 Fix license headers. 2016-10-18 11:29:10 +01:00
Tom Page
c7b4f284ff Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Tuna Aksoy
cf4dc8cbb1 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_111016
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionService.java
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
2016-10-11 17:00:35 +01:00
Tuna Aksoy
d25b0423fb Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
#	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
#	rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
#	rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
2016-10-10 20:49:13 +01:00
Tuna Aksoy
cba239d488 Merged V2.4 to V2.5 2016-10-07 14:42:43 +01:00
Tuna Aksoy
cdd02e9c13 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_a4c106d
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java
2016-10-07 14:40:39 +01:00
Tuna Aksoy
0614914beb Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
2016-10-05 15:20:19 +01:00
Tuna Aksoy
2db9730702 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
2016-10-04 22:56:45 +01:00
Tom Page
cf26f9b207 Let git handle line endings for us. 2016-09-23 10:38:16 +01:00
Tom Page
b3b2585e99 Let git handle line endings for us. 2016-09-23 10:34:36 +01:00
Tom Page
014e9662bc Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Tom Page
cb2457641f Let git handle line endings for us. 2016-09-21 14:53:15 +01:00
Ana Bozianu
85db34ff48 Merge release/V2.4 into release/V2.5 2016-09-21 14:33:23 +03:00
Ana Bozianu
935d6319e1 Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Tuna Aksoy
c3e480b649 RM-3902 (RM 2.5 Community Release) 2016-09-20 16:05:40 +01:00
Roy Wetherall
f2cbb3628a RM-3027: Remove extended security when a record is copied 2016-08-22 17:17:43 +01:00
Roy Wetherall
3bd4d2d74b RM-3074: Deleted creators cause failures when declaring records 2016-08-22 15:06:43 +01:00
Roy Wetherall
da05682d91 RM-3074: missing file 2016-08-19 10:20:09 +01:00
Roy Wetherall
caeee2dafa RM-3074: Review comments 2016-08-17 10:53:40 +10:00
Roy Wetherall
c000285a86 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-15 13:15:24 +10:00
Roy Wetherall
9de6c32046 RM-3074: Integration tests
* including fix for ghosted records being visible in collab sites
2016-08-15 13:14:53 +10:00
Roy Wetherall
34bdce8b35 Merge V2.4 to master 2016-08-12 09:02:32 +10:00
Roy Wetherall
c8e7c6272f Merge 4.2.0.1 to 2.4.1 2016-08-12 08:51:14 +10:00
Roy Wetherall
0a9543405a RM-3074: Unit test for records with renditions 2016-08-11 10:48:31 +10:00
Roy Wetherall
c7659f9b26 RM-3074: Rename getReader and getWriter methods 2016-08-09 15:06:48 +10:00
Roy Wetherall
30985f1784 RM-3074: Rename set/remove methods on extended security interface
* create deprecated service interface to tidy things up
* create set method and deprecate exisiting
* crate remove method and deprecate exisiting
* remove deprecation warnings in code
2016-08-09 12:01:16 +10:00
Roy Wetherall
e93bd3b74a RM-3074: place common logic to get readers and writers of a node in one place
* added getReadersAndWriters method to extended permission service
* refactored calling services, consolidating code into one location
* extended unit test

Note: getFullAuthenticatedUser has been removed from writers list as it
makes no logical sense since you must be a writer in order to perform
these operations in the first place.
2016-08-09 11:20:50 +10:00
Roy Wetherall
b22d408bc5 RM-3074: Inplace move no longer needs to modify extended security
* inplace move no longer needs to store and reset extended security
* no need to clear extended security when assoc is removed
* a couple of extra checks to inplace move integration test
2016-08-09 10:27:16 +10:00
Roy Wetherall
1e4c917c1d RM-3074: Refactor so read and write groups are reused independantly based on review comments 2016-08-08 12:31:44 +10:00
Roy Wetherall
0f676aa7f7 RM-3074: review comments 2016-08-08 11:04:30 +10:00
Roxana Lucanu-Ghetu
a5ba1b3804 Created a property for AlfrescoRuntimeException instead ot the message. 2016-08-04 11:09:15 +10:00
Roxana Lucanu-Ghetu
d6e365ec6c Moved check for content to be done on commit. 2016-08-04 11:08:53 +10:00
Roxana Lucanu-Ghetu
ee6e676e0d Added check to allow creating only records inside a record folder. 2016-08-04 11:08:36 +10:00
Roy Wetherall
7a3d9e119d MNT-16535: non admin users can't file email records via outlook integration 2016-08-04 10:47:20 +10:00
Roy Wetherall
4531d6a998 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-03 10:34:45 +10:00
Ana Bozianu
178fb5f750 Merge branch 'feature/RM-3708_LDAP_startup_error' into 'master'
Feature/rm 3708 ldap startup error

RM-3708 - [LDAP] Exception "NodeRef may not be null for calls to NodeService" is thrown in logs

The error is thrown when the application tries to run the disposition jobs as "$\{audit.rm.runas\}". When the value is not present in any property file the value is not interpreted.

This only reproduces when using some authentication chains because the authentication service is not reliable to check if a person exists. Some implementations of it just return true (AuthenticationServiceImpl) and some of them, in the best case scenario, reach person service to make the check.

As a fix I replaced authentication service with person service.

See merge request !378
2016-08-02 15:38:21 +01:00
Roy Wetherall
0cc92cf18a RM-3074: Remove unnecessary files 2016-08-02 20:07:13 +10:00
Roy Wetherall
9be6d1470b Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-02 11:21:40 +10:00
Roy Wetherall
f5d36623f1 RM-3074: groups assigned to RM roles, not authorities
* IPR groups are now assigned to RM roles rather than the individual
authorities
* more unit tests
2016-08-02 11:20:55 +10:00