Commit Graph

607 Commits (75e8b10e6c8bb6af7ad7286b5c6c5e89a4a2e24a)
 

Author SHA1 Message Date
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 6949d6f496 CCM NG/ccm-cms: Fixed typo in after-add-role dataset.
CCM NG/ccm-shortcuts: 
- Necssary changes due to changed permission behaviour (only in the test datasets).
- ccm-shortcuts now uses standard cleanup procedure between integratio tests


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

Former-commit-id: f74bfb2618
2017-01-28 20:23:15 +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 454a097c5c CCM NG/ccm-cms: All tests pass again
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4540 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: e72aaa7d62
2017-01-28 13:49:31 +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 3d97680d99 CCM NG/ccm-cms: DatatypeFactory for DBUnit enabled in Arquillian configuration for PostgreSQL
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4538 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 5555d424d0
2017-01-26 13:49:35 +00:00
jensp 9b855ee184 CCM NG/ccm-cms: Is now using Arquillian database cleanup
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4537 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 32abf07ebf
2017-01-26 13:40:09 +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 2924e8dd16 CCM NG/ccm-cms: Test pass again
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4530 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: b399419b12
2017-01-21 12:02:43 +00:00
jensp 32b4092d65 CCM NG/ccm-shortcuts: Tests pass again
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4529 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: ad51010466
2017-01-21 07:40: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 42078760b5 CCM NG/ccm-cms: ItemSearchPane now compiles (but will not work yet).
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4524 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: eadab49265
2017-01-18 16:27:42 +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 6aee634451 CCM NG/ccm-cms: ReportPane in ContentSectionPage enabled
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4522 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 78d0833d99
2017-01-17 09:54:58 +00:00
jensp cd80317c6c CCM NG/ccm-cms: ReportPane migrated to CCM NG. Works now with all supported database systems.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4521 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 2a84ea7ec3
2017-01-17 08:49:53 +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 6627872616 CCM NG/ccm-cms: ContentSoonExpiredPage migrated to new API
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4519 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 8ac6b655a0
2017-01-14 16:44:23 +00:00
jensp 112b1d40e3 CCM NG: Some cleanup
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4518 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 39aaa674ac
2017-01-13 13:47:57 +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
baka eb78eb4c44 Adds CategoryIteratorListModel
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4515 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 73af7b7a76
2017-01-05 18:15:55 +00:00
baka 2245dc8812 Adds CategoryBaseForm
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4514 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: b87158b53a
2017-01-05 17:57:35 +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
baka 41f0715e48 SVN mess 3rd
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4512 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 227f327109
2017-01-05 16:11:42 +00:00
baka 09ea58c3dc SVN mess 2nd
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4511 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: d8bdfd09f8
2017-01-05 16:05:19 +00:00
baka 37995d715c SVN mess
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4510 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 02da07fa6b
2017-01-05 15:45:54 +00:00
baka da5267080f Refactoring of already working files.
Also adds new comments

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

Former-commit-id: 8a9ce904e4
2017-01-05 15:43:52 +00:00
baka 5be80fd428 Adds all missing classes for category ui
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4508 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 4556aac1d5
2017-01-05 14:28:14 +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
tosmers 08ba214405 [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

Former-commit-id: 2dca8be89d
2016-12-12 18:43:27 +00:00