Commit Graph

406 Commits (b51ca7fcad2302a9ede16b659c97b65767fcfa2d)

Author SHA1 Message Date
jensp b644548c87 CCM NG/ccm-core: Improved performance for the configuration (reduced number DB-Queries for loading a configuration).
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4583 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: e510224845
2017-02-18 13:48:46 +00:00
jensp bb41d6df9e CCM NG/ccm-cms: BrowsePane: Changing current folder using the folder on the left now works.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4581 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 87780f49dc
2017-02-17 16:43:49 +00:00
jensp 0a25f0f03e CCM NG/ccm-cms: BrowsePane Expanding/collapsing of the folder on the left.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4580 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: c381a96446
2017-02-17 13:55:21 +00:00
jensp 36483ce25f CCM NG/ccm-cms: More work for the FolderBrowser
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4579 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 0842b94cf9
2017-02-16 18:07:31 +00:00
jensp e58cebd92f 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

Former-commit-id: bc466c0618
2017-02-16 13:17:48 +00:00
jensp cb0460ebbe CCM NG: Removed JPA metamodel generator. The generated classes caused problems (memory issues) when deploying to Wildfly.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4575 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: c6c137945d
2017-02-15 21:11:19 +00:00
jensp 897b014792 CCM NG/ccm-core: Improved JavaDoc for some methods of the CategoryManager..
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4571 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: ef21a73330
2017-02-15 10:40:40 +00:00
jensp 79797797ca CCM NG: Enabled generation of Criteria Metamodel classes required for completly type safe criteria queries.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4569 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 3d7a522844
2017-02-15 10:25:18 +00:00
jensp c94fe84b4c 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

Former-commit-id: 5a8dddfdfe
2017-02-15 09:33:52 +00:00
jensp 97c3f05a9e CCM NG/ccm-core: Added methods for setting the index object of a category to the CategoryManager
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4565 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 90b8b206e5
2017-02-15 09:30:54 +00:00
jensp bdf8b5c0bf CCM NG/ccm-cms: Next part of migration of the FolderBrowser
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4560 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 119cabe733
2017-02-11 18:15:52 +00:00
jensp a08e1138bc CCM NG/ccm-cms: FolderBrowser now shows up. Needs testing.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4557 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: ecb3a5c2ab
2017-02-08 18:07:03 +00:00
jensp b22235d53a CCM NG: Several small things
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4556 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 642b528358
2017-02-08 15:01:21 +00:00
jensp 25491c4b87 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

Former-commit-id: 448900e386
2017-02-08 08:18:19 +00:00
tosmers d03f547187 [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

Former-commit-id: cf95e4d26f
2017-02-07 20:44:46 +00:00
tosmers 8a3d212235 [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

Former-commit-id: eafaf8b613
2017-02-06 15:54:19 +00:00
jensp 7caa9cc652 CCM NG: Several things, mostly importantly removal of all usages of legacy log4j 1.2 API. Dependency for artifact log4j-1.2-api has been removed.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4551 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: db12e1447d
2017-02-04 16:37:18 +00:00
jensp b41b5e7c93 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

Former-commit-id: 95b2d335fa
2017-02-03 07:40:13 +00:00
jensp fecde66302 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

Former-commit-id: 285cc3b6c5
2017-02-03 07:24:38 +00:00
jensp 75e8b10e6c 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

Former-commit-id: e1b612a2fb
2017-02-01 20:34:43 +00:00
jensp f006894cbb CCM NG/ccm-cms: Several things for the dispatching prodecure.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4547 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: dae2186488
2017-02-01 14:03:46 +00:00
jensp 4b426b4026 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

Former-commit-id: b3c89804e3
2017-02-01 12:40:34 +00:00
jensp 69e4b2f5a5 CCM NG: Some fixes
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4543 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 3e7bfa33aa
2017-01-30 18:51:18 +00:00
jensp a1f26f283c CCM NG: JavaDoc for the recursive permissions behaviour.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4541 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 255516772f
2017-01-28 14:13:56 +00:00
jensp 2d0ceeb3ce CCM NG/ccm-cms: Bugfixing
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4539 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: fbc487b44a
2017-01-27 19:16:52 +00:00
jensp b49aa8b6a5 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

Former-commit-id: 22dda86fee
2017-01-25 20:18:00 +00:00
jensp 60a545456a 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

Former-commit-id: 39b74d511a
2017-01-24 16:32:57 +00:00
jensp c0315684c7 CCM NG: Permissions are now written recursivly
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4534 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: a8c85aaca9
2017-01-23 20:39:42 +00:00
jensp e1b54a5347 CCM NG: First part of changed permission inhertitence
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4533 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 413edda57a
2017-01-23 19:11:56 +00:00
tosmers 91de348df8 [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

Former-commit-id: 4adfd0c7d3
2017-01-23 18:10:26 +00:00
jensp c30f84bf29 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

Former-commit-id: 0a24284c08
2017-01-20 21:04:31 +00:00
jensp 8d8f045302 CCM NG/ccm-cms: BrowsePane migrated to NG APIs
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4527 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: ff93de29f0
2017-01-20 16:38:39 +00:00
tosmers 1c598b387e [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

Former-commit-id: 389f8ef6cf
2017-01-19 20:47:31 +00:00
jensp 25b6196b7d CCM NG/ccm-cms: RoleAdminPane ported
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4523 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 26015af797
2017-01-18 13:31:21 +00:00
jensp 0eedb6ad0b CCM NG/ccm-cms: First part of migration the ReportPane
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4520 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: b061e0e50b
2017-01-16 20:03:20 +00:00
jensp db84343eee CCM NG: ContentItem Page ported
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4517 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: b35735ae13
2017-01-13 13:19:02 +00:00
jensp a09f8c59fd CCM NG: Current progress of the migration of the UI for ccm-cms
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4516 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: e1d81d005f
2017-01-11 18:35:23 +00:00
tosmers c8f8668828 [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

Former-commit-id: bc9ca4a86d
2017-01-05 16:45:54 +00:00
jensp 4c7b949cec CCM NG/ccm-cms: ItemSearch UI now uses CCM NG APIs
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4503 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 21931f464b
2016-12-23 19:50:57 +00:00
tosmers df79895080 [UPDATE]
- switches json's back-managed references on every attribute in each exportable class

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4496 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 5954dc2dd7
2016-12-20 19:27:21 +00:00
jensp ea1900d8dc CCM NG: Current progress of porting the ItemSearch forms to NG
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4495 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 31884ea9e3
2016-12-20 18:37:35 +00:00
jensp 2ce77fb924 CCM NG: Hibernate Search annotations for CcmObject, ContentItem and some associated objects
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4494 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: f69a9e3e4d
2016-12-20 09:06:40 +00:00
jensp 0e3f579790 CCM NG: Fixed bugs in dispatcher code
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4493 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 0a5ca7025d
2016-12-19 20:51:26 +00:00
jensp 5829412d2f CCM NG: DB Migration fix
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4492 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 32c7be64c2
2016-12-19 19:13:24 +00:00
jensp 3459afc2db CCM NG: Missing DB migrations
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4491 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 40dcf2e757
2016-12-19 19:05:36 +00:00
jensp c8ad4a3a10 CCM NG/ccm-cms: Annotations for Hibernate Search
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4490 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: fa1af66913
2016-12-19 15:35:58 +00:00
jensp 3545fd665b CCM NG/ccm-cms : Support for Hibernate Search queries for content items
CCM NG/ccm-core: JavaDoc for the SearchManager 


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4489 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: bde2e27293
2016-12-19 15:34:11 +00:00
jensp b207f1f22d CCM NG: Test for handling permissions in JPQL Queries
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4488 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: e591f71a66
2016-12-19 10:05:04 +00:00
jensp c4662f4274 CCM NG: Basic integration for Hibernate Search
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4487 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 60661478fd
2016-12-17 16:39:10 +00:00
jensp a38485014b CCM NG:
- Some preparation for the editor UI for PageModel
- SimpleItemResolver and MultilingualItemResolver ported to new API (still disabled because of circular dependencies in UI classes)


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4486 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: aa3f76e4a1
2016-12-16 16:41:16 +00:00