Commit Graph

206 Commits (32e886d287712051ac50c0b5f0f7767a857d2c31)

Author SHA1 Message Date
tosmers 863e026034 [CCM][UPDATE]
- adds all missing serialVersionUIDs to import/export classes
  (e.g. Manager, Repository, Marshaller, IdGenerator, IdResolver)
- marks Marshaller-class (interface import/export to gui) as deprecated, to force review when implementing gui for import/export

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5216 8810af33-2d31-482b-a856-94f89814c4df
2018-01-24 18:10:59 +00:00
tosmers 4aa96fdfcd [CCM][UPDATE]
- improves the file handling for the import tests using systems temp folder

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5215 8810af33-2d31-482b-a856-94f89814c4df
2018-01-24 17:28:41 +00:00
jensp 592becebb2 CCM NG:
- First version of new HTML editor
- Integration of new HTML editor into build system 


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5201 8810af33-2d31-482b-a856-94f89814c4df
2018-01-18 13:15:54 +00:00
tosmers 27e4413d2c [NG][FEATURE]
- adds import of taskDependencies and taskAssignments
- successfully imports data for all major core classes

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5198 8810af33-2d31-482b-a856-94f89814c4df
2018-01-15 16:48:08 +00:00
tosmers ff0ad85336 [NG][FEATURE]
- adds capability to import assignable tasks
- adds IdGenerator and Marshaller for TaskDependency
- import of TaskDependencies not working yet

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5166 8810af33-2d31-482b-a856-94f89814c4df
2017-12-12 18:04:27 +00:00
jensp 76b422be8a CCM NG: Refactored dependencies between tasks from an n:m relation to two 1:n relations using an relation entity (TaskDependency). Also renamed some attributes to make the dependency relations more readable.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5162 8810af33-2d31-482b-a856-94f89814c4df
2017-12-10 20:19:18 +00:00
jensp 3685b1f341 CCM NG: Several bugfixes
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5151 8810af33-2d31-482b-a856-94f89814c4df
2017-11-30 17:54:08 +00:00
jensp b38023fa2a CCM NG: Fixed bug
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5150 8810af33-2d31-482b-a856-94f89814c4df
2017-11-30 09:58:06 +00:00
jensp 9ae6f34446 CCM NG: Admin UI for PageModels in the Vaadin Prototype.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5137 8810af33-2d31-482b-a856-94f89814c4df
2017-11-23 18:38:55 +00:00
tosmers 01b55796e5 [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 b3a61d420f 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 e280aaf0a1 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 d9b3fcdd74 [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 8209244a33 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 a15eadb194 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 2ccf47fbba 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 607e6468cc 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 4442c13edb 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 fce01dc128 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 552d8ae755 [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 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