inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,345 Commits 324 Branches 2,170 Tags
54ad44883c24ed258622d4d9d8c3637048166ac5
Commit Graph

88 Commits

Author SHA1 Message Date
Tuna Aksoy
54ad44883c RM-3276 (Edit and Application of Marks to a Single User) 2016-04-27 13:37:18 +01:00
Tom Page
3314b1737c Merge branch 'xperimental/RM-2812_MarkPublicAPIs' into 'master' 
Xperimental/rm 2812 Mark Public APIs

First attempt to mark classes that should be part of the public API with \@AlfrescoPublicAPI.

I have also added a couple of \@deprecated annotations to classes where I thought it made sense, and
added comments to classes that I wanted to add to the public API but couldn't (due to their contract
being dependent on non-public API classes).

See merge request !138
 2016-04-27 09:23:58 +01:00
Tom Page
c28264c8c0 RM-2812 Finalisation of first pass of classes to annotate. 2016-04-27 09:15:37 +01:00
Tom Page
9ead3bd771 RM-2812 Add audit service and dependencies. 
Having thought about this more, I don't think there's any problem adding
a deprecated class to the public API, as long as it's clearly marked as
such. It's deprecated at the moment because we think people might be using
it, but we want them to migrate to something else. Declaring this as part of
the public API formalises this process.

The RecordsManagementAuditService has the following dependencies:

RecordsManagementAuditQueryParameters <- RecordsManagementAuditService
RecordsManagementAuditEntry <- RecordsManagementAuditService
AuditEvent <- RecordsManagementAuditService
 2016-04-20 16:24:44 +01:00
Tom Page
9c0b13133b RM-2812 Update following review comments. 
The class dependency used to determine the classes to include based on the initial services is:

Depth 0: Service interfaces.

Depth 1:
ClearanceLevel <- SecurityClearanceService
RecordsManagementActionCondition <- RecordsManagementActionService
ClassificationAspectProperties <- ContentClassificationService
Version <- RecordableVersionConfigService, RecordableVersionService
Role <- FilePlanRoleService
CaveatGroupType <- CaveatSchemeService
RecordsManagementEvent <- RecordsManagementEventService
Group <- CapabilityService
RelationshipDisplayName <- RelationshipService
RecordsManagementActionResult <- RecordsManagementActionService
RecordsManagementAction <- RecordsManagementActionService
Relationship <- RelationshipService
ProtectedModelArtifact <- ModelSecurityService
ReportGenerator <- ReportService
RecordsManagementSearchParameters <- RecordsManagementSearchService
SecurityClearance <- SecurityClearanceService
SortDirection <- CaveatSchemeService
RecordsManagementEventType <- RecordsManagementEventService
Report <- ReportService
UserQueryParams <- SecurityClearanceService
CaveatMarkSortField <- CaveatSchemeService
ProtectedProperty <- ModelSecurityService
RelationshipDefinition <- RelationshipService
Capability <- FilePlanRoleService, CapabilityService
ExemptionCategory <- ClassificationSchemeService
CaveatGroup <- CaveatMarkingService, CaveatSchemeService
ClassificationReason <- ClassificationSchemeService
ProtectedAspect <- ModelSecurityService
MetadataReferral <- ReferralAdminService, ReferredMetadataService
CaveatMark <- CaveatClearanceService, CaveatMarkingService, ContentClassificationService, CaveatSchemeService, ClassificationSchemeService
SavedSearchDetails <- RecordsManagementSearchService
IdentifierGenerator <- IdentifierService

Depth 2:
RecordsManagementActionConditionDefinition <- RecordsManagementActionCondition
ReferralRegistry <- MetadataReferral
ClassificationSchemeEntity <- ExemptionCategory, ClassificationReason
RecordsManagementActionDefinition <- RecordsManagementAction
ReportDetails <- SavedSearchDetails
SortItem <- RecordsManagementSearchParameters
SavedSearchDetailsCompatibility <- SavedSearchDetails

Depth 3:
RecordsManagementModel <- SavedSearchDetailsCompatibility

Depth 4:
RecordsManagementCustomModel <- RecordsManagementModel
 2016-04-20 16:14:07 +01:00
Ana Bozianu
be070b20e5 Merge release/V2.4 into master 2016-04-20 18:04:27 +03:00
Ana Bozianu
32bb544bfc RM-3310 - added null check 2016-04-20 14:27:07 +03:00
Tom Page
0659402f13 RM-2812 Mark public API methods with @AlfrescoPublicAPI. 2016-04-19 16:24:46 +01:00
Tuna Aksoy
7b705e005e RM-3150 (Errors when generating Javadoc for RM using Java 8) 2016-04-18 16:19:06 +01:00
Roxana Lucanu
594d146c8e Merge release/V2.4 into master 2016-04-15 16:16:45 +03:00
Roxana Lucana-Ghetu
5b01cbaf43 Merge branch 'feature-2.4/RM-3285' into 'release/V2.4' 
Feature 2.4/rm 3285

Added check not to be able to put null in cache, for nodes that are not records and don't have a filePlan.
Added unit test for it.

See merge request !128
 2016-04-15 13:44:57 +01:00
Roxana Lucanu
f3ed3f9197 RM-3285 - added null check for adding in cache 2016-04-15 13:34:30 +03:00
Silviu Dinuta
e2c9524a07 Merged release/V2.4 into master 2016-04-15 11:32:34 +03:00
Silviu Dinuta
a5c1b69690 Merge branch 'feature-2.4/RM-3233_NonElectronicRecordsCanNotHavePropertiesChangedThroughRulesInUnfiledRecords' into 'release/V2.4' 
Feature 2.4/rm 3233 non electronic records can not have properties changed through rules in unfiled records

When setting a foreground rule to change one properties for files that enter to a folder from Unfiled Records, when trying to create a nonElectronic record sometimes because it was very hard to reproduce this issue, SetPropertyValueActionExecuter is executed before adding the Record aspect from RecordsManagementContainerType.onCreateChildAssociation() and that's why it fails when checking UpdateProperties capability.

When creating "rma:nonElectronicDocument" document formprocessor is used and at some point updateNode from node service is used to update the properties. Therefore I made sure that each time when udating "rma:nonElectronicDocument" node the Record aspect is added if not present.

See merge request !124
 2016-04-15 09:23:29 +01:00
Ana Bozianu
34b7db52aa Merge release/V2.4 into master 2016-04-14 19:40:25 +03:00
Silviu Dinuta
f8332dccae Added unit tests for NonElectronicRecordType and fixed typo 2016-04-14 18:54:41 +03:00
Silviu Dinuta
0d52abc77e Added @author and @since for the class 2016-04-14 15:24:30 +03:00
Ana Bozianu
59c100af97 RM-3283 - added comment to explain change 2016-04-14 14:25:29 +03:00
Silviu Dinuta
0007fc3013 Added NonElectronicRecordType class to make sure that Record aspect is 
added before entering in UpdatePropertiesPolicy for nonElectronic
documents
 2016-04-14 12:06:39 +03:00
Ana Bozianu
663c6175fc RM-3283 - added extra check for hidden aspect + unit test 2016-04-14 11:28:21 +03:00
Tom Page
747265e003 Merge release/V2.4 into master. 2016-04-13 10:16:57 +01:00
Ana Bozianu
a0dc5a06d0 Merge branch 'feature-2.4/RM-3216_RegressionIMAP' into 'release/V2.4' 
Feature 2.4/rm 3216 regression imap

RM-3274 - Error creating bean with name 'imapServiceBootstrap'

I added an invalid authentication util bean reference to the extended IMAP service and the setter was missing.

See merge request !117
 2016-04-13 07:30:16 +01:00
Roxana Lucana-Ghetu
f4cc2e08cf Merge branch 'feature-2.4/RM-3030_PreviewNotAvailableDeclaredRecord' into 'release/V2.4' 
Feature 2.4/rm 3030 preview not available declared record

RM-3030 - The documents declared as records in their Details page don't have the preview available afterwards.

I've noticed different behavior when doing steps in different order: if the file is declared as record before navigating to document details page, the error doesn't reproduce; if document details page is accessed first and after declare the file as record,  there is an Access Denied exception.
In the first case the node for preview has the File Plan aspect, in the second one it doesn't.

See merge request !105
 2016-04-12 14:10:39 +01:00
Ana Bozianu
afd6570ba8 RM-3274 - fixed invalid AuthenticationUtil bean refference 2016-04-12 14:59:02 +03:00
Tuna Aksoy
7336d9da4b Merge branch 'release/V2.4' 
Conflicts:
	rm-automation/src/test/java/org/alfresco/test/TestData.java
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_zh_CN.properties
 2016-04-12 09:30:57 +01:00
Ana Bozianu
6d82d89d18 RM-3266 - added an extra check when invoking onAddAspect 2016-04-11 20:04:26 +03:00
David Webster
d3db151180 Merge branch 'release/V2.4' 2016-04-08 14:07:09 +01:00
Ana Bozianu
a48e690ad3 RM-3216 - added unit test 2016-04-08 14:46:14 +03:00
Ana Bozianu
6935c5ea36 RM-3216 - extended IMAP service and corrected method 2016-04-07 16:06:29 +03:00
Roxana Lucanu
8de82a81df RM-3030 - renamed variable and changed comment 2016-04-06 17:52:38 +03:00
Roxana Lucanu
e6d1757a3a RM-3030 - added filePlan aspect for every thumbnail from renditions 2016-04-06 16:49:42 +03:00
Roy Wetherall
c59d9d00c9 RM-3181, RM-3195: ensure JSON conversion component works when no file plan is found 2016-04-06 10:24:27 +10:00
Roy Wetherall
dc526e4a48 RM-3181 and RM-3195 - error accessing caveatConfig.json after modifications 
Caveat config file had filePlanComponent applied, but wasn't contained
within a file plan.
 2016-04-05 14:38:36 +10:00
Ana Bozianu
c162075eb6 Merge release/V2.4 into master 2016-04-04 09:55:10 +03:00
Roy Wetherall
77078d3445 Merge branch 'feature-2.4/RM-3077_LinkedAndCutOffRecordsPropertiesNotAvailableForUsersWithNoAccessToLinkedFolder' into 'release/V2.4' 
Feature 2.4/rm 3077 linked and cut off records properties not available for users with no access to linked folder

Uses runAsSystem for obtaining instructions, recordCategory and categoryId in RecordsManagementNodeFormFilter.AddTransientProperties()

See merge request !94
 2016-04-04 01:59:29 +01:00
Ana Bozianu
3be929afae RM-2967 - added exists, null and empty checks to solve the problems 2016-04-01 19:02:29 +03:00
Silviu Dinuta
da5df7efbb RM-3077 : Used runAsSystem to obtain disposition instructions, 
recordCategory and
categoryId
 2016-04-01 12:40:41 +03:00
Tuna Aksoy
996a28836c Merge branch 'release/V2.4' 
Conflicts:
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
 2016-03-31 15:29:35 +01:00
Roy Wetherall
20a7a01760 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature-2.4/RM-3148-RuleInheritancePatch 2016-03-30 09:44:33 +11:00
Ana Bozianu
3a64d7d19d Merge release/V2.4 into master 2016-03-24 14:39:40 +02:00
Roy Wetherall
2a6b2f0751 RM-3148 - File Plan containers rule inheritance patch implementation 2016-03-24 13:07:56 +11:00
Ana Bozianu
426d782923 RM-3000 - fixed issue for setPropertyValue, executeScript and sendEmail and added unit test 2016-03-23 13:03:34 +02:00
Tuna Aksoy
99de1973f4 RM-3132 (Update license headers) 2016-03-16 10:40:33 +00:00
Tuna Aksoy
78bcf02aa7 Merge branch 'release/V2.4' 2016-03-16 10:32:35 +00:00
Tuna Aksoy
8b9734d873 RM-3132 (Update license headers) 2016-03-16 10:26:58 +00:00
Tuna Aksoy
bb48e4de97 Merge branch 'release/V2.4' 2016-03-15 15:08:17 +00:00
Tuna Aksoy
1882c86a38 Merge branch 'release/V2.4' 
Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/rules/fileplan/CreateFilePlanRulePage.java
	rm-community/.editorConfig
	rm-community/.jshintrc
	rm-community/pom.xml
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java
	rm-enterprise/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/caveat-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/context/webscript-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/log4j.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/caveat-model.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/model/caveatModel.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/module-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroups.get.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ClearanceForAdminBootstrapComponent.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatException.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOCache.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrap.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOInterface.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/model/CaveatModel.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatAccessUtility.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroup.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatMark.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatUtils.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManager.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessor.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGet.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecorator.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/quickshare/ExtendedQuickShareServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/properties/local/alfresco-global.properties
	rm-enterprise/rm-enterprise-repo/src/main/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/caveat/CaveatsBootstrapTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassifyTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImplUnitTestBase.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_NodeRefUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_UserUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/TestOnlyCaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrapUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManagerUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceServiceImplUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessorUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGetUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecoratorUnitTest.java
	rm-enterprise/rm-enterprise-share/.jshintrc
	rm-enterprise/rm-enterprise-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/renderers/ClassificationLabel.js
 2016-03-15 12:10:53 +00:00
Roy Wetherall
209c3ed9a5 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature-2.4/RM-3148-FilePlanInheritedRulesNotFiring 2016-03-15 11:59:32 +11:00
Roy Wetherall
44a188dabf Remove now unessesary checks from rule execution (RM-3148) 2016-03-15 11:59:13 +11:00
Roy Wetherall
e0cef2c6e1 Ensure that rules are not inherited onto the file plan, unfiled records, holds and transfers root containers (RM-3148) 2016-03-15 10:49:19 +11:00