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
1,889 Commits 324 Branches 2,170 Tags
105b2eefb6b990a88da27f37d99a6b75c57f0d35
Commit Graph

1037 Commits

Author SHA1 Message Date
Roy Wetherall
16d04e84b3 Reduce number of compilation warnings and re-format where nessesary. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-09 01:58:11 +00:00
Tom Page
2ae7a18fc9 RM-1947 Restrict the classification levels shown to a user. 
Currently we don't check what classification level the user has, and
instead assume that they have the highest security clearance. The work
to assign a security clearance to a user will be in RM-2112.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-08 14:55:58 +00:00
Tuna Aksoy
df9ab69ab8 RM-1827 ("Declare" actions become available for user only after re-login) 
* Changes reverted

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-08 09:18:58 +00:00
Alexandru Balan
385fb32397 Merged BRANCHES/V2.3 to HEAD: 
101283: RM-2092 - fixed the re-association when copying a record

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-08 07:19:20 +00:00
Alexandru Balan
6c2ec73ea5 RM-2092 - fixed the re-association when copying a record 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@101283 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-08 07:11:24 +00:00
Tuna Aksoy
9365daaafa RM-1827 ("Declare" actions become available for user only after re-login) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 20:07:52 +00:00
Tuna Aksoy
3395a70900 RM-1827 ("Declare" actions become available for user only after re-login) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101279 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 19:48:57 +00:00
Tom Page
5ea9e93c51 Minor changes to WebScriptUtils. 
I'm not sure which static import was being used previously, but since we
had an explicit reference to lang3 I went with that.

+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 13:55:44 +00:00
Tom Page
b8e6ea3912 RM-2028 Create util method to validate classification fields. 
Also change the freemarker script to use the built-in JSON escaping.

+review RM-14

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 13:55:42 +00:00
Tuna Aksoy
cfb69a4a04 Merged BRANCHES/V2.3 to RMHEAD: 
101232: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        101230: RM-193 (Roles are displayed incorrectly in User Rights Report)
   101233: commit merge info

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 11:13:41 +00:00
Tuna Aksoy
a475460272 Merged BRANCHES/V2.2 to BRANCHES/V2.3: 
101230: RM-193 (Roles are displayed incorrectly in User Rights Report)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@101232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 11:06:58 +00:00
Tuna Aksoy
4f4bd07440 RM-193 (Roles are displayed incorrectly in User Rights Report) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@101230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-07 10:16:15 +00:00
Tuna Aksoy
b9cebb788a RM-1827 ("Declare" actions become available for user only after re-login) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-03 18:30:38 +00:00
Tuna Aksoy
eeafedd88e RM-2028 Create a rest API to get classification reasons 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-01 13:30:18 +00:00
Tom Page
10e3036d05 RM-2028 Create a rest API to get classification reasons. 
The API can be accessed through the following URI:
http://localhost:8080/alfresco/service/api/classification/reasons

Note that the private classificationService bean is currently being used
as there is an issue with the authentication when using the public bean.

Log error message contains:
Caused by: net.sf.acegisecurity.AccessDeniedException: Access is denied.
RM method security check was performed.
Failed on method:  getClassificationReasons()
; nested exception is net.sf.acegisecurity.AccessDeniedException: Access is denied.
	at org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor.beforeInvocation(RMMethodSecurityInterceptor.java:299)

+review RM @taksoy

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-01 12:27:01 +00:00
Alexandru Balan
51ff6a1851 Merged BRANCHES/V2.3 to HEAD: 
100726: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
      100725: RM-1586 : Add another search for the property in the case of legacy html encoded properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-30 15:36:14 +00:00
Alexandru Balan
808ba031c1 Merged BRANCHES/V2.2 to BRANCHES/V2.3: 
100725: RM-1586 : Add another search for the property in the case of legacy html encoded properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@100726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-30 15:19:59 +00:00
Alexandru Balan
7bb27bbf7a RM-1586 : Add another search for the property in the case of legacy html encoded properties 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@100725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-30 15:14:49 +00:00
Tom Page
f95eabd052 Wire the ClassificationServiceDAO using Spring injection. 
Also small change to lower visibility of ClassificationServiceDAO member
variables from public to private.

+review RM @nmcerlean @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-30 14:49:10 +00:00
Tom Page
95262cfdc4 RM-2027 Make class logger static final. 
Previously the logger wasn't final to allow it to be set for unit testing.
We're only testing it in the one test, so instead use a mock log4j appender
to check that the message is received.

+review RM-11

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100717 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-30 14:15:24 +00:00
Tom Page
ad7ae82746 Rename Configuration to ClassificationServiceDAO. 
Also formatting changes as per code review comments.

+review RM-5

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-30 09:13:32 +00:00
Tom Page
a734159cee RM-2027 Unit testing for classification reason loading. 
+review RM @nmcerlean

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-27 16:43:59 +00:00
Neil McErlean
bb20d042cf Work on RM-2027. Addition of the Java API code to retrieve classification reasons and some of the test code associated with that. WIP. Test code not complete. +review RM 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-27 09:27:20 +00:00
Neil McErlean
22ead45f3f Refactoring test code to separate it from BaseUnitTest. RM-2027. +review RM 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-26 15:07:28 +00:00
Tom Page
40bfbb7cd4 RM-2074 Fix comment and imports. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-26 11:04:06 +00:00
Tom Page
d2ce0009d9 RM-2074 Bootstrap initial classification reasons. 
+review RM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-26 10:43:48 +00:00
Neil McErlean
5ae80ab2b1 Second and final tranche of post-code-review changes for RM-1945 & RM-1946. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-25 19:39:09 +00:00
Neil McErlean
0cfc1a98bf First updates following code review on RM-1945 & RM-1946. Thanks Roy & Tom! 
Renamed a public service method to getClassificationLevels.
Removed a redundant test method.
Code tidying.
Various internal renames to help readability.
Slight javadoc improvements.
Also some trivial changes like fixing typos and copyright years etc.
Removing warnings from within AuthenticationUtil blocks allows IntelliJ to fold them to Java 8 closure format. (fistpump).  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@100020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 21:15:22 +00:00
Neil McErlean
5451568517 Tidyup as part of RM-1945 and RM-1946. Attempt to fix the failing build. 
Although the Alfresco server starts fine on my machine, there is a timing/dependency issue which means that on Bamboo, ClassificationServiceImpl.initConfiguredClassificationLevels attempts to use the Alfresco DB before it is fully ready.
This check-in changes the service startup so that instead of using a spring init-method, it uses a LifecycleBean to run the initialisation after the server has fully started up.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-24 11:32:44 +00:00
Neil McErlean
aee333172a Initial creation of ClassificationService, as part of RM-1945 and RM-1946. 
This check-in adds the basic ClassificationService API, its initial implementation, ClassificationServiceImpl, along with some basic support types such as ClassificationServiceException (for service-specific exceptions) and Configuration.
It also adds unit tests ClassificationServiceImplUnitTest and ConfigurationUnitTest.

The ClassificationService begins our support for ‘Classified Records’, whereby Alfresco content can be given a ClassificationLevel and thereafter will only be accessible to users with the appropriate security clearance.

The vanilla service includes a default set, rm-classification-levels.json (Top Secret etc) which links through to the i18n’d display data via rm-classification.properties in the usual way.

The service is defined in its own spring context file, rm-classified-records-context.xml, as it is distinct from the file plan and should be applicable to content outside that file plan.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-23 18:22:26 +00:00
Roy Wetherall
a6e1a890ea Merged V2.3 to HEAD: 
99472: Merged V2.2 to V2.3:
        99471: RM-2058: RM Manager can't access Users and Groups (after upgarde)
   99473: Fix merge error (RM-2058)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@99474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-16 01:26:19 +00:00
Roy Wetherall
860e07b25a Merged V2.2 to V2.3: 
99471: RM-2058: RM Manager can't access Users and Groups (after upgarde)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@99472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-16 00:17:26 +00:00
Roy Wetherall
0161f18ec6 RM-2058: RM Manager can't access Users and Groups (after upgarde) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-15 23:48:58 +00:00
Roy Wetherall
40eb638711 Merged V2.3 to V2.1.1: 
96823: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
   97435: RM-1903: Can't manage permissions without "Manage Access Controls" capability
   97436: RM-1903 - updates to unit tests
   97595: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-12 23:14:33 +00:00
Roy Wetherall
4978949842 Merged HEAD to V2.2: 
89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site

* fixes RM-2018



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-10 04:32:04 +00:00
Roy Wetherall
79e31a391a RM-2026: Unable to complete historical records when mandatory meta-data missing 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-10 03:10:49 +00:00
Roy Wetherall
62d442060d Merged V2.3 to V2.2: 
96580: RM-1904 (SubCategory moved to root have inheritance on)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-09 21:57:32 +00:00
Roy Wetherall
1931466253 Merged V2.3 to V2.2: 
92881: RM-1799 (Root category is not displayed for the non-rm-admin user who created it)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-09 21:53:53 +00:00
Tatiana Kalinovskaya
2cb3dbb7b5 RM-1727 (Error on Folder/record details page when user have no permissions on parent category) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-06 14:27:45 +00:00
Tuna Aksoy
4ac32d51a6 RM-1827 ("Declare" actions become available for user only after re-login) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@98379 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-02 21:58:14 +00:00
Tuna Aksoy
db1ec1fae2 RM-1981 (Cant reject the record that has any version records) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-26 21:13:55 +00:00
Tuna Aksoy
f212d67b58 RM-1980 (Can't delete version record if it is the last version of the document) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@98190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-26 21:10:51 +00:00
Roy Wetherall
0834d4961c RM-1959: User can add/remove relationship to/from record he has read-only permissions for 
* integration tests
 * small fix to service implementation



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-25 04:17:54 +00:00
Roy Wetherall
af6f894ed0 Prevent incompatiable disposition schedules from being linked together 
* the unpredicatable behaviour was caused by this incompatibility and the resulting uncertaintity over which level of dispostion would 'win'
  * RM-1963: It is not possible to cut off record scheduled for cut off if it's linked to a folder with disposition schedule with cut off step set on folder.
  * RM-1962: The disposition schedule steps are not working as expected on a record linked to a folder with disposition schedule on it's own.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-25 00:25:33 +00:00
Roy Wetherall
890dd9417c RM-1956: Create record capability allows user to edit metadata and copy category/folder /record 
* fixes issue relating to filing records with only CreateRecord capability



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-24 21:38:10 +00:00
Roy Wetherall
a3c738dd04 Missed update .. fix build. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-24 00:18:26 +00:00
Roy Wetherall
fc3fb36a3b Attempt to fix failing Unit Tests that are passing locally. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-24 00:07:08 +00:00
Roy Wetherall
ca1f697f45 RM-1972: Methods with invalid policy are granted access 
* invalid policy defintions now throw exception .. previously they just granted!
  * invalid capability definitions now throw exception .. previously they abstained with no message
  * reference to RM.Write removed and replaced with RM.Create or more appropriate permission check
  * adjustments to hold capabilities since they wheren't being exercised as we thought
  * ManageAccessRights no longer checks for frozen .. you should be able to manage the permissions of an object if it's frozen and you have the capability
  * Unit tests for new code and adjustments
  * Tweaks to existing integration tests where required



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-23 23:02:09 +00:00
Tuna Aksoy
8ed56c8d91 RM-1956 (Create record capability allows user to edit metadata and copy category/folder /record) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-22 14:11:17 +00:00
Alexandru Balan
cc7243370e Merged BRANCHES/V2.2 to BRANCHES/V2.3: 
97533: RM-1586 - server-side fix for legacy custom property names that might contain spaces

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@97600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-02-20 14:18:54 +00:00