Commit Graph

197 Commits (50d200db9cb51db1ebbbf75d70948f3b5848d844)

Author SHA1 Message Date
tosmers f4f17b790f [NG][UPDATE]
- excludes xml annotations from import
- adds exported data

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5133 8810af33-2d31-482b-a856-94f89814c4df
2017-11-23 15:46:59 +00:00
jensp f717f54093 CCM NG: Fixed some test failures
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5127 8810af33-2d31-482b-a856-94f89814c4df
2017-11-21 16:28:47 +00:00
jensp 6661456806 CCM NG: Cleanup of the Vaadin prototype
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5092 8810af33-2d31-482b-a856-94f89814c4df
2017-10-29 18:37:54 +00:00
tosmers 3903b7dbd9 [NG][UPDATE]
- minor modifications in core classes for import
- adds new batch of files with exported objects

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5089 8810af33-2d31-482b-a856-94f89814c4df
2017-10-27 15:51:21 +00:00
jensp b32a48f922 CCM NG: Some small things
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5082 8810af33-2d31-482b-a856-94f89814c4df
2017-10-25 15:51:30 +00:00
baka a78c71fa20 Replaces the simple calls with no arguments to newInstance()
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5078 8810af33-2d31-482b-a856-94f89814c4df
2017-10-25 13:26:01 +00:00
jensp 8a4fed4311 CCM NG: JavaDoc for Sites and PageModel
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5074 8810af33-2d31-482b-a856-94f89814c4df
2017-10-23 14:35:44 +00:00
jensp 952ef32587 CCM NG: Sites/Pages/Themes next part
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5044 8810af33-2d31-482b-a856-94f89814c4df
2017-10-13 15:59:22 +00:00
jensp f117574c8f CCM NG: Fixed some compilion failures
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5016 8810af33-2d31-482b-a856-94f89814c4df
2017-09-27 19:57:37 +00:00
jensp e4bbfc3e41 CCM NG:
- Removed class WorkflowTemplate, replaced by property abstractWorkflow in class workflow
- Fixed several test failures



git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5015 8810af33-2d31-482b-a856-94f89814c4df
2017-09-27 19:45:02 +00:00
tosmers 33101e984d [CCM][FEATURE]
- adds import capabilities for workflow templates, workflows and task comments
- fixes problems in workflow imports

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5014 8810af33-2d31-482b-a856-94f89814c4df
2017-09-27 17:48:47 +00:00
tosmers d7da3652fd [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 67531353c3 [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 5cb177ee7f [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 5cdd00c83d 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 61b7ba63b0 [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 cb4da653cd [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 ecf3e90b6f [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 cf72e8de4a [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 7c97e82e87 [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 565b103bfa 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 e8960f8812 [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 bd85950ce5 [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 120c995385 [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 eae5fa0edc [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 0153f10833 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 834952bc85 [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 33b9f3048a 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 46ff680193 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 bc466c0618 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 5a8dddfdfe 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 642b528358 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 448900e386 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 cf95e4d26f [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 eafaf8b613 [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 95b2d335fa 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 285cc3b6c5 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 e1b612a2fb 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 b3c89804e3 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 fbc487b44a 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 22dda86fee 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 39b74d511a 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 a8c85aaca9 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 413edda57a 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 4adfd0c7d3 [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 0a24284c08 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 389f8ef6cf [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 bc9ca4a86d [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 2dca8be89d [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 cc1cbc6da0 [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