Tuna Aksoy
0e3f27f4e2
RM-3229 (Repo AMP contains unwanted libraries)
2016-03-30 20:12:39 +01:00
Roy Wetherall
1844ecc199
Consolidate pluginExecution sections in root POM
2016-03-30 09:57:54 +11:00
Roy Wetherall
ad07c548ee
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
Roy Wetherall
bd39de53a1
RM-3114 - Integration tests
2016-03-30 09:32:28 +11:00
Roy Wetherall
a40aa2af33
RM-3114: Prevent access to custom map before it is ready
...
- remove public init method from AdministrationService
- make admin service impl ordered listener, always goes last
- protect execution of service behaviours until custom map init'ed
2016-03-29 13:09:56 +11:00
Ana Bozianu
a8fd5726f2
Merge release/V2.4 into master
2016-03-24 14:39:40 +02:00
Roy Wetherall
382a14adce
Update release version to 2.2.1.5
2016-03-24 18:30:52 +11:00
Ana Bozianu
b582b248d9
Merge branch 'feature-2.4/RM-3000_setPropertyValueInRMRulesNotWorking' into 'release/V2.4'
...
Feature 2.4/rm 3000 set property value in rm rules not working
RM-3000 - The set property value action can not be used in RM rules page.
Because the actions were not working as expected in other languages the mechanism has been changed to use localization in MNT-6350 and a caching mechanism has been implemented. So the getLocalizedParameterDefinitions is called only once at server startup. The actions in RM have been added before this change and we continued to implement getParameterDefintions.
The method getLocalizedParameterDefinitions which is protected calls addParameterDefinitions to build the results so I've overridden addParameterDefinitions to include the delegate's parameters for DelegateAction.
The actions executeScript and sendEmail were also affected by this change. I've added unit test to cover all 3 of them.
See merge request !81
2016-03-24 06:28:19 +00:00
Roy Wetherall
c745543b5f
RM-3148: Patch unit test
2016-03-24 13:35:23 +11:00
Roy Wetherall
813d3dee13
RM-3148 - File Plan containers rule inheritance patch implementation
2016-03-24 13:07:56 +11:00
Roy Wetherall
90ed398624
Adjust POM's so plugin execution errors are masked in Eclipse
2016-03-24 12:24:07 +11:00
Ana Bozianu
33e90196de
RM-3000 - fixed issue for setPropertyValue, executeScript and sendEmail and added unit test
2016-03-23 13:03:34 +02:00
Tuna Aksoy
7af8ddd1c2
Merge branch 'release/V2.4'
2016-03-23 08:19:43 +00:00
Tuna Aksoy
93f709edc2
Removed .gitattributes file as it was causing problems.
2016-03-23 08:18:51 +00:00
Tuna Aksoy
e3dad719cf
Removed .gitattributes
2016-03-23 08:15:53 +00:00
Tuna Aksoy
1a7e777a44
.gitattributes config for binary files
2016-03-23 08:13:12 +00:00
Tuna Aksoy
1ca5578633
Merge branch 'release/V2.4'
...
Conflicts:
rm-community/rm-community-share/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/messages/classified-content.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/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/model/CaveatModel.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/CaveatUtils.java
rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationServiceImpl.java
rm-enterprise/rm-enterprise-repo/src/main/properties/local/alfresco-global.properties
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/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/ClassificationSchemeServiceImplUnitTest.java
rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationServiceImplUnitTest.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-share/pom.xml
2016-03-22 22:53:24 +00:00
Tuna Aksoy
4372073088
Merge branch 'feature-2.4/crlf' into release/V2.4
2016-03-22 07:52:34 +00:00
David Webster
956b0b2870
Update README to point to ide-config
2016-03-21 15:53:34 +00:00
David Webster
73dffa1398
Add IntelliJ code formatting settings to project
2016-03-21 12:03:27 +00:00
Tuna Aksoy
e0379c61a1
Added IDE config files
2016-03-21 10:55:06 +00:00
Jean-Pierre Huynh
e64025e055
BDE-548:
...
- Modified pom to use the maven-release-plugin
- Disable doclint
- Removed the explicit call to maven-source-plugin. The source jars will be created by the maven-release-plugin
2016-03-18 16:01:54 +00:00
David Webster
1c7aa1de1f
CRLF: Update following review. Remove explicit binary types and trust Git to work it out on its own
2016-03-16 14:45:32 +00:00
David Webster
87ffd26d09
Configure CRLF line endings for whole repo
...
(cherry picked from commit 5f594edd19e37e0c6a838104c80d0da93943c428)
(cherry picked from commit d179e44f7cba552554be5aa3bf30c5eec20dd2e5)
2016-03-16 14:42:00 +00:00
Kristijan Conkas
ab7764955f
Merge remote-tracking branch 'origin/master' into feature/RM-2718_ViewCaveatMarks
2016-03-16 13:44:55 +00:00
Tuna Aksoy
c33a401a3d
RM-3132 (Update license headers)
2016-03-16 10:40:33 +00:00
Tuna Aksoy
85f3bf9afc
Merge branch 'release/V2.4'
2016-03-16 10:32:35 +00:00
Tuna Aksoy
8fcc027af0
RM-3132 (Update license headers)
2016-03-16 10:26:58 +00:00
Kristijan Conkas
42c80a0cde
Merge remote-tracking branch 'origin/master' into feature/RM-2718_ViewCaveatMarks
2016-03-15 17:43:36 +00:00
Tuna Aksoy
ba875c7e37
Merge branch 'release/V2.4'
2016-03-15 16:01:33 +00:00
Tuna Aksoy
2c7ed37785
RM-3132 (Update license headers)
2016-03-15 15:48:38 +00:00
Tuna Aksoy
e00becde59
Merge branch 'release/V2.4'
2016-03-15 15:08:17 +00:00
Tuna Aksoy
2b14d7b4ba
RM-3132 (Update license headers)
2016-03-15 14:53:01 +00:00
Tuna Aksoy
06f039f137
RM-3132 (Update license headers)
2016-03-15 14:45:28 +00:00
Tuna Aksoy
78fa0d872b
RM-3132 (Update license headers)
2016-03-15 14:39:57 +00:00
Tuna Aksoy
a592177d08
RM-3132 (Update license headers)
2016-03-15 14:31:14 +00:00
Tuna Aksoy
099ad1685d
RM-3132 (Update license headers)
2016-03-15 13:47:12 +00:00
Tuna Aksoy
3ca80f293f
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
2dfc8d0f27
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
3768638ffe
Remove now unessesary checks from rule execution (RM-3148)
2016-03-15 11:59:13 +11:00
Roy Wetherall
169b975b46
Extend integration test to show rule inheritance on record categories working as expected (RM-3148)
2016-03-15 11:20:53 +11:00
Roy Wetherall
587a966477
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
Tuna Aksoy
c923dc0b9f
RM-3132 (Update license headers)
2016-03-14 17:15:02 +00:00
Tuna Aksoy
aa690919b2
RM-3132 (Update license headers)
2016-03-14 17:04:23 +00:00
Tuna Aksoy
687307edbe
RM-3132 (Update license headers)
2016-03-14 17:01:03 +00:00
Tuna Aksoy
626f7e4da7
Merge branch 'feature-2.4/RM-3132_Update_license_headers' into release/V2.4
...
Conflicts:
rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/customizations/components/rules/rules-header.get.js
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/java/org/alfresco/module/org_alfresco_module_rm/classification/package-info.java
rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/package-info.java
rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/config/rule-config-action.get.js
rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/config/rule-config-condition.get.js
rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/rule-details.get.js
rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/rm-enterprise/components/rules/rule-edit.get.js
2016-03-14 16:37:43 +00:00
Tuna Aksoy
ff1c81d825
RM-3132 (Update license headers)
2016-03-14 16:17:53 +00:00
Tuna Aksoy
54fba30c44
RM-3132 (Update license headers)
2016-03-14 16:12:09 +00:00
Tuna Aksoy
f01d2e1d41
RM-3132 (Update license headers)
2016-03-14 16:07:46 +00:00
Tuna Aksoy
27c76455c8
RM-3132 (Update license headers)
2016-03-14 16:05:44 +00:00