Commit Graph

634 Commits (cb0460ebbec60f9e9024ca8eded418bb66e4ae00)
 

Author SHA1 Message Date
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
baka e4f87724c9 Localization Stuff, the 2nd
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4574 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: cb69cdd941
2017-02-15 16:29:13 +00:00
baka df2b08d4ac Implements the use of setIndexObject into IndexItemSelectionForm.
Is the exception handling correct?

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

Former-commit-id: f3ad0e491e
2017-02-15 16:02:24 +00:00
baka 2c5afa14bc Begin of reimplementation of CategoryLocalization
Also adds a lot of key/value pairs to the CmsResources

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

Former-commit-id: db8725c222
2017-02-15 15:52:01 +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
baka 6d29d3fdc6 Reimplements CategoryAdminContainer to work with ng.
It may be not the correct way how the permisson is passed to the constructor, though.
Must be checked for correctness.

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

Former-commit-id: 43a9c2621b
2017-02-15 10:34:39 +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
baka 6816b5938b Refactored CategorizedObjectsList, but removed sorting for now
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4568 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 9b448912ed
2017-02-15 10:18:50 +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 c10e58d0da CCM NG/ccm-bundle-devel-wildfly-swarm: Set svn:ignore for target directory.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4566 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 5988cd3665
2017-02-15 09:31:39 +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 2a9884b592 CCM NG: First part of Wildfly Swarm module
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4564 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: b594f5a11d
2017-02-14 19:12:45 +00:00
jensp 172ba64d9a CCM NG: Dependencies for the Devel Bundle are now collected in a separate module which can be used by the bundling modules for the various application servers.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4563 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 092b7d05cf
2017-02-14 18:28:25 +00:00
jensp 1d6af9cb44 CCM NG/ccm-cms: Missing file
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4562 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 8de4cc2f3f
2017-02-14 18:27:19 +00:00
jensp f3c30fe82d CCM NG/ccm-cms: FolderBrowser now shows up, buts needs more testing
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4561 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 98059e41db
2017-02-14 18:26:07 +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 f030d102f6 CCM NG/ccm-cms: Trying to get FolderBrowser working...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4559 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: c18a28562f
2017-02-09 11:20:12 +00:00
baka 40a70c49e0 Adds some localization strings
Refactored and reimplemented IndexItemSelectionForm

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

Former-commit-id: d64f8c5b30
2017-02-08 19:21:45 +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
jensp e10dbc3639 CCM NG/ccm-cms: Migration of CMSPermissionsTables to new API (not completly finished yet)
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4553 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 00d2858e0d
2017-02-06 18:13:39 +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 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