Commit Graph

186 Commits (0fec39a477c9cbb8f52c80b623bd381b56d0f909)

Author SHA1 Message Date
tosmers f02c03ccf3 [CCM][UPDATE]
- adds import functionality of Permission and WorkflowTemplate
- import of workflows still buggy...
- optimizes imports

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4989 8810af33-2d31-482b-a856-94f89814c4df
2017-09-07 09:22:08 +00:00
tosmers 54c17a3d28 [CCM][FEATURE]
- adds import functionalities for core's ResourceType, CcmApplication, Domain and DomainOwnership
- optimizes imports in some core packages

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4987 8810af33-2d31-482b-a856-94f89814c4df
2017-09-06 13:45:39 +00:00
tosmers 8c359045d1 [CCM][UPDATE]
- adds new export data with category objects for use with import tests

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4868 8810af33-2d31-482b-a856-94f89814c4df
2017-07-12 18:14:11 +00:00
jensp 051e71f2a0 CCM NG: Fixed some test failures
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4867 8810af33-2d31-482b-a856-94f89814c4df
2017-07-12 18:09:58 +00:00
tosmers 37af5a40e4 [CCM-NG][UPDATE]
- adds new exported data files for import, again

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4843 8810af33-2d31-482b-a856-94f89814c4df
2017-07-05 17:34:42 +00:00
tosmers 67b803bc85 [CCM][UPDATE]
- modifies import test with output message of selected group to check members
- changes RoleMembershipMarshaller's insertIntoDb-method

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4826 8810af33-2d31-482b-a856-94f89814c4df
2017-06-29 18:33:11 +00:00
tosmers 468208c225 [CCM][UPDATE]
- adds new import xml files, where roles are not duplicated from export
- corrects idResolver implementation of Group, User, Party, Role, and Category
- adds correct working import of Groups, Users, GroupsMemberships, Roles, RoleMemberships

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4801 8810af33-2d31-482b-a856-94f89814c4df
2017-06-23 16:54:35 +00:00
tosmers 8804fad68c [CCM][UPDATE]
- modifies import tests
- adds new xmls for import

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4797 8810af33-2d31-482b-a856-94f89814c4df
2017-06-22 09:26:23 +00:00
tosmers 83738eebf0 [CCM-NG][UPDATE]
- modifies import tests

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4774 8810af33-2d31-482b-a856-94f89814c4df
2017-06-12 17:30:51 +00:00
jensp eeaf014b0e CCM NG/ccm-cms: First part of migration of ArticlesPropertiesStep
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4736 8810af33-2d31-482b-a856-94f89814c4df
2017-05-15 17:43:46 +00:00
tosmers 1a13ff6bf6 [CCM-NG][UPDATE]
- adds new generated export xml files

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4728 8810af33-2d31-482b-a856-94f89814c4df
2017-05-10 18:11:00 +00:00
tosmers 8634a6046c [UPDATE]
- adds small changes in Users import routine

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4721 8810af33-2d31-482b-a856-94f89814c4df
2017-05-10 15:04:58 +00:00
tosmers 065eab611f [UPDATE]
- comments export test with block comment

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4707 8810af33-2d31-482b-a856-94f89814c4df
2017-05-04 16:07:33 +00:00
tosmers 582988ada4 [UPDATE]
- adds implementation to all resolveId-methods of the IdResolver-classes
- modifies generateId-method for PermissionIdGenerator to match the trunk implementation of the idGenerator
- adds missing findBy-methods to repositories

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4703 8810af33-2d31-482b-a856-94f89814c4df
2017-05-03 16:58:35 +00:00
jensp b59eb89268 CCM NG/ccm-cms: Creating content items works now
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4695 8810af33-2d31-482b-a856-94f89814c4df
2017-04-29 14:53:14 +00:00
tosmers 6942e20910 [UPDATE]
- adds new export content for import to tests resources
- exchanges Jackson back- and managed-reference annotations with identityInfo, ignore and identityReference annotations 
- adds necessary ObjectIdGenerator and ObjectIdResolver implementations
- does not yet implement the generateId-Method of every ObjectIdResolver

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4640 8810af33-2d31-482b-a856-94f89814c4df
2017-03-23 18:48:52 +00:00
jensp 7673c3314d CCM NG/ccm-core: Removed org.libreccm.formbuilder.WidgetLabel.java. In its current implementation it caused strange problems when querying the database.
CCM NG/ccm-cms: Granting/Revoking permissions using the PermissionsPane in the FolderBrowser now works


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4622 8810af33-2d31-482b-a856-94f89814c4df
2017-03-03 19:45:54 +00:00
jensp 99799c832c CCM NG: Fixed several test failures due to recent changes.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4594 8810af33-2d31-482b-a856-94f89814c4df
2017-02-22 20:40:07 +00:00
jensp 19aaed5baa CCM NG:
- Database cleanup scripts for tests now running before test methods and not after. This means that the database is still intact after a test is run. Useful for debugging.
- ContentSectionSetup now add content types to content section
- Some things for the Documents tab in the content centre


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4578 8810af33-2d31-482b-a856-94f89814c4df
2017-02-16 13:17:48 +00:00
jensp 3c17226320 CCM NG: Reenabled defaultCleanupPhase=NONE in arquillian.xml. All tests should have @CleanupUsingScript which is executed regardless of the configured cleanup phase. Setting
defaultCleanupPhase=NONE makes it easier to disable the cleanup (just by commenting the annotation on the test class out) for debugging purposes.


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4567 8810af33-2d31-482b-a856-94f89814c4df
2017-02-15 09:33:52 +00:00
jensp e9bcd0c0ff CCM NG: Several small things
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4556 8810af33-2d31-482b-a856-94f89814c4df
2017-02-08 15:01:21 +00:00
jensp 59235f45af CCM NG/ccm-cms: Next part of new CMSPermissionsTable
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4555 8810af33-2d31-482b-a856-94f89814c4df
2017-02-08 08:18:19 +00:00
tosmers cfe7ca44e4 [UPDATE]
- modifies importFiles-method in AbstractMarshaller.java to return boolean for easier test evaluation
- reduces import tests to a single xml file for easier problem finding 
- modifies insertIntoDb method overriden by RoleMembershipMarshaller

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4554 8810af33-2d31-482b-a856-94f89814c4df
2017-02-07 20:44:46 +00:00
tosmers 35d91826e4 [UPDATE]
- adds minor changes in partation's CoreDataImportTest-routine

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4552 8810af33-2d31-482b-a856-94f89814c4df
2017-02-06 15:54:19 +00:00
jensp 86e6289a59 CCM NG: Some repositories still returned null instead of Optional
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4550 8810af33-2d31-482b-a856-94f89814c4df
2017-02-03 07:40:13 +00:00
jensp d00f438bdd CCM NG: Refactored all (hopefully) Repositories to return an Optional instead of a result or null for the methods returning a single entity as result.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4549 8810af33-2d31-482b-a856-94f89814c4df
2017-02-03 07:24:38 +00:00
jensp 809475465a CCM NG:
- Removed EntityGraphs. They did not work as intended.
- Moved operations on entities in CcmShiroRealm to separate class. The CcmShiroRealmController wraps these operations into a transaction to avoid LazyInititalizationExceptions.


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4548 8810af33-2d31-482b-a856-94f89814c4df
2017-02-01 20:34:43 +00:00
jensp 647f182943 CCM NG: Bugfixes for the CCMDispatcherServlet and some other things.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4546 8810af33-2d31-482b-a856-94f89814c4df
2017-02-01 12:40:34 +00:00
jensp b69d12fcbc CCM NG/ccm-cms: Bugfixing
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4539 8810af33-2d31-482b-a856-94f89814c4df
2017-01-27 19:16:52 +00:00
jensp f8ae2e1bd3 CCM NG: Inherited permissions are now stored in the database for each object making it possible to check permissions when querying data from the database. The InheritsPermissions interface has been removed.
Also, the usage of the cleanup script has been changed. The automatic cleanup of Arquillian is not longer disabled (in ccm-core). Instead a custom cleanup script is applied using the @CleanupUsingScript annotation on the test classes.


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4536 8810af33-2d31-482b-a856-94f89814c4df
2017-01-25 20:18:00 +00:00
jensp cf0e6ab432 CCM NG: Changes for the PermissionManager to pass tests.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4535 8810af33-2d31-482b-a856-94f89814c4df
2017-01-24 16:32:57 +00:00
jensp 7f5772800a CCM NG: Permissions are now written recursivly
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4534 8810af33-2d31-482b-a856-94f89814c4df
2017-01-23 20:39:42 +00:00
jensp 3ebcde0b8c CCM NG: First part of changed permission inhertitence
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4533 8810af33-2d31-482b-a856-94f89814c4df
2017-01-23 19:11:56 +00:00
tosmers f48baf8f13 [UPDATE]
- adds @Inject-statements for marshaller-objects to ImportHelper.class

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4532 8810af33-2d31-482b-a856-94f89814c4df
2017-01-23 18:10:26 +00:00
jensp 68eef5082e CCM NG: Fixed several problems in tests due to several changes.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4528 8810af33-2d31-482b-a856-94f89814c4df
2017-01-20 21:04:31 +00:00
tosmers 7dc8b757cc [UPDATE]
- adds modified files for import testing
- adds annotations @RequestScoped and @Marshals(<classname>) to all Marshaller classes
- adds annotation @JsonIgnore to getter in LocalizedString.java

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4526 8810af33-2d31-482b-a856-94f89814c4df
2017-01-19 20:47:31 +00:00
tosmers 1e92bef7ca [UPDATE]
- adds @Transitional annotation to all marshaller implementations-
- updates export test data

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4513 8810af33-2d31-482b-a856-94f89814c4df
2017-01-05 16:45:54 +00:00
tosmers c7d5c89d0b [UPDATE]
- modifies managed/back references
- adds updated export data for import

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4472 8810af33-2d31-482b-a856-94f89814c4df
2016-12-12 18:43:27 +00:00
tosmers 4a922246bc [FEATURE]
- adds testclass for core import
- adds testdata for core import

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4462 8810af33-2d31-482b-a856-94f89814c4df
2016-12-05 15:51:35 +00:00
jensp bdf9058901 CCM NG: New PageModel system, replaces JSP templates for public pages in ccm-cms and ccm-navigation
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4458 8810af33-2d31-482b-a856-94f89814c4df
2016-12-02 16:35:24 +00:00
jensp c12830e315 CCM NG: Some changes to tests and datasets necessary due to the changes to workflow
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4446 8810af33-2d31-482b-a856-94f89814c4df
2016-11-18 20:45:38 +00:00
jensp 45e2463de6 CCM NG: DB migrations scripts for recent changes of workflow classes, changed datasets for tests to match new structure
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4445 8810af33-2d31-482b-a856-94f89814c4df
2016-11-18 13:53:28 +00:00
jensp 2ae87e3353 CCM NG: JavaDoc for Workflow and related classes
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4444 8810af33-2d31-482b-a856-94f89814c4df
2016-11-17 16:53:45 +00:00
jensp 48dea0fb14 CCM NG/ccm-core,ccm-cms: Some changes to Workflow, Task etc. Primarly some missing features/methods required by Workflow UI in CCM CMS.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4441 8810af33-2d31-482b-a856-94f89814c4df
2016-11-16 18:37:08 +00:00
jensp 0cccf9dec4 CCM NG/ccm-cms: Extended ContentTypeRepositoryTest to check if annotations for authorisation work.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4366 8810af33-2d31-482b-a856-94f89814c4df
2016-10-09 07:49:25 +00:00
jensp 8e4d572331 CCM NG: JavaDoc for several tests
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4364 8810af33-2d31-482b-a856-94f89814c4df
2016-10-07 17:26:36 +00:00
jensp 8df8169646 CCM NG: JavaDoc for PermissionManager and PermissionManagerTest
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4353 8810af33-2d31-482b-a856-94f89814c4df
2016-10-05 17:05:05 +00:00
jensp 10d5c57271 CCM NG:
- Renamed privilege constants in ccm-core to match naming convention (constants for privilege should start with "PRIVILEGE_")
- Added method PermissionsManager#listDefiniedPrivileges(Class) which lists all privileges constants definied in a class.


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4352 8810af33-2d31-482b-a856-94f89814c4df
2016-10-05 15:47:36 +00:00
jensp b674042e34 CCM NG: Reverted changes from r4350: Interfaces and Annotations don't work together but we need the annotations...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4351 8810af33-2d31-482b-a856-94f89814c4df
2016-10-05 15:13:30 +00:00
jensp 1ebbe0e59d CCM NG: Preparation for replacing privilege strings with enums.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4350 8810af33-2d31-482b-a856-94f89814c4df
2016-10-04 17:56:09 +00:00