Commit Graph

5254 Commits

Author SHA1 Message Date
Ana Bozianu
985c77ece6 Merge branch 'feature-2.4/RM-2937_RecordDestructionKeepingMetadata' into 'release/V2.4'
Feature 2.4/rm 2937 record destruction keeping metadata

RM-2937 - The destruction of records can not be completed if the metadata is set to be maintained after destruction.

The issue reproduces only if image magic is correctly installed. If the node to be destroyed has associated renditions cleaning the rendition's content is failing because there is no capability to allow the operation. This in a regression from 2.3 where method security was disabled for the class that was deleting the thumbnails.

The code has been refactored in 2.4 and the content cleaning is performed in a new class. ExtendedContentDestructionComoponent uses the NodeService interface which enforces method security. ExtendedContentDestructionComoponent  extends ContentDestructionComoponent from community which uses the nodeService implementation. I fixed it by using the implementation directly.

After fixing the issue I noticed the renditions nodes are not deleted which is a regression from 2.3 and there is no comment to specify this was intended so I deleted the rendition node.

I noticed that the method ContentDestructionComponent.destroyContent has the parameter includeRenditions which is not being used in the code. We are deleting the rendition even if this boolean is set to false. Should I fix it with this issue or should we raise another issue for this problem. Please advise.

See merge request !39
2016-02-23 09:54:52 +00:00
Ana Bozianu
a3a956a35e Merge remote-tracking branch 'origin/release/V2.4' 2016-02-22 16:34:19 +02:00
Ana Bozianu
156fc5b48e Merge release/2.4 into master 2016-02-22 16:16:38 +02:00
Ana Bozianu
2d473a865e Merge branch 'feature-2.4/RM-2996_UploadUnfiledReacordsWithRuleOnFilePlan' into 'release/V2.4'
Feature 2.4/rm 2996 upload unfiled reacords with rule on file plan

RM-2996 - Files can not be uploaded in Unfiled Records if the File Plan has rules defined applying to sub-folders

The execution of rules as well as RM's RecordsManagementContainer.onCreateChildAssociation behavior fire before transaction commit and is unpredictable which one will run first. If the rule runs first the newly uploaded node doesn't have rma:filePlanComponent set at the time the method shouldRuleBeAppliedToNode executes. Calling recordService.isFiled(nodeRef)) will trigger capability check among which ViewRecordsCapability will check if the record has the rma:filePlanComponent aspect.

As a fix I ran the code from shouldRuleBeAppliedToNode method as system to avoid capability check.

I am aware the fix is a workaround but I think this is part of a bigger problem. The rules are fired before transaction commit and may conflict with other behaviors registered on transaction commit. However, we cannot add the aspect earlier in RM.

See merge request !37
2016-02-22 08:54:59 +00:00
Ana Bozianu
dbf123af83 RM-2937 - The destruction of records can not be completed if the metadata is set to be maintained after destruction.
- removed nodeService and eagerContentStoreCleaner from rm.contentDestructionComponent bean as they are already set on contentDestructionComponent
   - fixed the ignored boolean
2016-02-19 13:31:17 +02:00
Tom Page
573b9e3b9f Merge release/V2.4 into master. 2016-02-18 11:10:10 +00:00
Ana Bozianu
19b36d664f RM-2937 - The destruction of records can not be completed if the metadata is set to be maintained after destruction.
- ExtendedContentDestructionComoponent uses the NodeService interface which enforces capability check. ExtendedContentDestructionComoponent  extends ContentDestructionComoponent from community which uses the nodeService implementation. I fixed it by using the implementation directly.
   - After fixing the issue I noticed the renditions nodes are not deleted which is a regression from 2.3 and there is no comment to specify this was intended so I deleted the rendition node.
2016-02-18 12:18:00 +02:00
Tom Page
2bd1f7cdf9 Merge release/V2.3 into release/V2.4. 2016-02-18 09:29:01 +00:00
Tom Page
7c9e5f915f Merge release/V2.3 into release/V2.4.
Record only merge of RM-2709 (which is already fixed on V2.4 and above).
2016-02-18 09:21:02 +00:00
Tom Page
358555c332 Merge release/V2.3.0.x into V2.3. 2016-02-18 08:25:03 +00:00
Tom Page
9fb2189bea Update version to 2.3.0.3-SNAPSHOT. 2016-02-18 08:16:49 +00:00
Tom Page
0f2347e8ba Update version to 2.3.0.2. 2016-02-18 07:35:28 +00:00
Tom Page
8384ec47cf Merge branch 'feature-2.3/RM-2968_CutoffQuery' into 'release/V2.3.0.x'
Feature 2.3/rm 2968 cutoff query

See merge request !36
2016-02-18 07:30:41 +00:00
Ana Bozianu
3700a455c9 RM-2996 - Files can not be uploaded in Unfiled Records if the File Plan has rules defined applying to sub-folders.
- recordService.isFiled(nodeRef) fires capability check which conflicts with RM behavior so I run shouldRuleBeAppliedToNode code as system to skip capability check
   - this approach is a workaround
2016-02-17 15:37:19 +02:00
Tom Page
ca46be936e RM-2968 Update disposition query used to find nodes to cutoff or retain. 2016-02-17 10:50:05 +00:00
Tom Page
f67c5fe319 Update version to 2.3.0.2-SNAPSHOT. 2016-02-17 10:36:53 +00:00
Tuna Aksoy
43412d9211 Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'
Feature/rm 2685 caveat groups view ui

See merge request !34
2016-02-15 20:22:04 +00:00
Tuna Aksoy
0a0dd17d86 Merge branch 'feature/RM-2717_ListCaveatMarks' into 'master'
Feature/rm 2717 list caveat marks

See merge request !33
2016-02-15 20:15:31 +00:00
Tom Page
9b755000e0 RM-2776 Move SortDirection to rm-community.
This is a general-use enum, and so it should be somewhere fairly accessible.
2016-02-15 14:24:46 +00:00
Tuna Aksoy
0d9babad6c Merge branch 'master' into feature/RM-3039_AikauUpgrade 2016-02-15 10:57:01 +00:00
David Webster
9a15fb188c Merge remote-tracking branch 'origin/master' into feature/RM-2685_caveatGroupsView_UI 2016-02-12 17:03:28 +00:00
Tom Page
06064c8fbb Merge release/V2.4 into master. 2016-02-12 08:32:15 +00:00
Tom Page
dfe51239d1 Merge branch 'feature-2.4/FixBrowseListWait' into 'release/V2.4'
Feature 2.4/fix browse list wait

See merge request !31
2016-02-12 08:31:12 +00:00
Tom Page
cc8c073ae9 Revert "Revert "Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'""
This reintroduces all the changes performed on the RM-2685_caveatGroupsView_UI
feature branch, so that development can continue.

This reverts commit 08df63624e.
2016-02-11 15:34:29 +00:00
Tom Page
08df63624e Revert "Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'"
This reverts commit 8ae74856df, reversing
changes made to 141e84aa3cb4ffd6c0332b45e91c23f5031f4007.
2016-02-11 15:32:55 +00:00
David Webster
efc8a0d328 README updates to clarify the directory commands should be run from and to specify the command for the UI tests 2016-02-11 13:30:11 +00:00
David Webster
8ae74856df Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'
RM-2686: View Caveat Groups

See merge request !30
2016-02-11 11:43:23 +00:00
Tom Page
77c9e656b9 Fix the BrowseList getItemCount call.
Previously, for the standard format of message "1 - 4 of 4", this was
returning 0 because the code was expecting three space separated values,
not five.
2016-02-11 11:39:55 +00:00
Roy Wetherall
3d9f2b0d7b Spring configuration for module compatibility component. 2016-02-11 14:42:23 +11:00
Roy Wetherall
753d072f51 Initial implementation 2016-02-10 12:02:37 +11:00
Tuna Aksoy
5ba5e74874 RM-2709 (The Add Relationship dialog is not displayed properly and is unusable on Alfresco 5.1) 2016-02-09 20:13:28 +00:00
Tom Page
6d07ddfc79 Merge release/V2.4 into master. 2016-02-09 08:34:31 +00:00
Ana Bozianu
20809b6d8d Merge branch 'feature-2.4/RM-2947_FixChemistryDependency' into 'release/V2.4'
Feature 2.4/rm 2947 fix chemistry dependency

Fix recent failing UI tests that have the message "java.lang.NoSuchMethodError:
org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory.createCmisBrowserBinding"
This cherry picks the fix which I accidentally committed to master rather than release/V2.4.

See merge request !29
2016-02-09 08:26:08 +00:00
Tom Page
f3cdd30937 RM-2947 Remove unnecessary chemistry dependency.
This dependency is provided by the dataprep librarywhich also provides
the implementation. Both should be version 0.10.0 or 0.11.0, but we
were taking 0.10.0 of one and 0.11.0 of the other. This should fix the
NoSuchMethodErrors we were seeing.

(cherry picked from commit 329d39a316)
2016-02-08 15:34:36 +00:00
Tom Page
22236ba924 Convert rm-automation pom file to have windows line endings. 2016-02-08 15:33:41 +00:00
Tom Page
329d39a316 RM-2947 Remove unnecessary chemistry dependency.
This dependency is provided by the dataprep librarywhich also provides
the implementation. Both should be version 0.10.0 or 0.11.0, but we
were taking 0.10.0 of one and 0.11.0 of the other. This should fix the
NoSuchMethodErrors we were seeing.
2016-02-08 14:47:10 +00:00
David Webster
abe8c8fe7c Merge origin/master 2016-02-08 10:18:02 +00:00
Tuna Aksoy
d50702d400 Merge branch 'release/V2.4'
Conflicts:
	rm-automation/pom.xml
	rm-automation/src/main/java/org/alfresco/po/share/details/DetailsPage.java
	rm-automation/src/test/java/org/alfresco/test/integration/smoke/AutoDeclareVersionsAsRecords.java
	rm-automation/src/test/java/org/alfresco/test/integration/smoke/DeclareInPlaceRecord.java
	rm-automation/src/test/java/org/alfresco/test/integration/smoke/FileUnfiledRecords.java
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
2016-02-07 22:50:53 +00:00
Tuna Aksoy
ca30c0f3e2 Fixed the version number for rm-automation on master 2016-02-07 22:28:38 +00:00
Tuna Aksoy
b03a15b23c RM-2944 (Make RM UI Test builds predictable) 2016-02-07 21:50:06 +00:00
Tuna Aksoy
0f1d6a9cd0 RM-2944 (Make RM UI Test builds predictable) 2016-02-07 17:49:22 +00:00
Tuna Aksoy
3e2b4013d3 Merge branch 'feature/RM-2991_ConvertMockRESTAPI' 2016-02-06 21:52:13 +00:00
Tuna Aksoy
c6356a4105 Tided up the pom files (Defined the versions for plugins so that we don't need to specify them in every pom file and we can use the same version in all submodules)
Conflicts:
	rm-enterprise/rm-enterprise-automation/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
2016-02-06 20:53:11 +00:00
Tuna Aksoy
d6ce427249 Replaced the deprecated parameter "tasks" with "target" for the maven-antrun-plugin 2016-02-06 19:54:01 +00:00
Tuna Aksoy
6bcf6a44f2 Tided up the pom files (Defined the versions for plugins so that we don't need to specify them in every pom file and we can use the same version in all submodules)
Conflicts:
	rm-enterprise/rm-enterprise-automation/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
2016-02-06 19:53:37 +00:00
Tuna Aksoy
c57d22fc3b Replaced the deprecated parameter "tasks" with "target" for the maven-antrun-plugin 2016-02-05 23:38:07 +00:00
Tuna Aksoy
58586bb6e7 Tided up the pom files (Defined the versions for plugins so that we don't need to specify them in every pom file and we can use the same version in all submodules) 2016-02-05 22:21:36 +00:00
Tuna Aksoy
f74167ccc5 Merge branch 'release/V2.4' 2016-02-05 10:27:38 +00:00
Tuna Aksoy
ea5dfa9212 Changed the way how property values are maintained in module.properties. 2016-02-04 23:11:02 +00:00
Tom Page
1c9756f168 Merge V2.4 into master.
This doesn't bring any changes to master, but makes it clear that all
commits have been merged (e.g. when viewing the network history on GitLab).
2016-02-04 08:00:50 +00:00