Bert Leunis pushed to branch bugfix/HSTTWO-3808 at cms-community / hippo-site-toolkit
Commits: f1076f85 by Ate Douma at 2016-08-22T16:47:32+02:00 HSTTWO-3775: [backport v10.2] drop no longer functional nor needed setup of freemarker LoggerLibrary cherry-picked from HSTTWO-3723 - - - - - 015b5071 by Arent-Jan Banck at 2016-09-15T11:40:19+02:00 HSTTWO-3799 prepare release hst-3.2.2 - - - - - 1b00dc49 by Arent-Jan Banck at 2016-09-15T11:40:23+02:00 HSTTWO-3799 prepare for next development iteration - - - - - 601ca8e3 by Ard Schrijvers at 2016-09-27T20:51:02+02:00 HSTTWO-3812 [Backport 3.2] make the form data storage model much more efficient Instead of storing every form field as a separate node, just store all form fields in a single json string. Note that the old behavior can be restored through setting in the hst-config.properties: form.data.flat.storage = false Also note the *old* storage model can still be read in FormUtils#populate (cherry picked from commit 3bd2faee651102823343053ed3a9383302e43105) (cherry picked from commit 40ed84e836f5a0be5cce8c9a63463b860bc809e2) - - - - - f533af6b by Ard Schrijvers at 2016-09-27T20:51:36+02:00 HSTTWO-3812 [Backport 3.2] add extra parameters for the #persistFormMap to better control how the form data gets stored We need for downstream project to control better where the form data gets stored, whether a formId is added and whether or not a render parameter u_u_i_d needs to be added to the response (cherry picked from commit c6a9cb33f7d9dd53c8ec8b0f6dd6079d6b627d1d) (cherry picked from commit 715c3b6d0e0c28b0c75e69ee9c308cb490f66372) - - - - - cf47496d by Ard Schrijvers at 2016-09-27T20:51:53+02:00 HSTTWO-3812 [Backport 3.2] support 'label' field on FormField that can contain the label (next to the (jcr node) name) (cherry picked from commit ce75f224e6fcdfc089405b6f165a1ba7bb3ce9a8) (cherry picked from commit 10a6ee9ce2fca52bcad48e78278614bb13f333e8) - - - - - 16ddfcc0 by Ard Schrijvers at 2016-09-27T20:52:13+02:00 HSTTWO-3812 [Backport 3.2] Sanitize the FormField object to be better suited for json (de)serialization It doesn't make sense that 'values' is a map where always the key and value are the same. It should just be a list. For backwards compatibility, I keep the public methods but store the value in 'valueList' from now on. The #get/setValues should not be serialized (jackson) hence the @JsonIgnore Also, it is easier for messages and valueList to be never null. No null checks needed and (de)serialization via jackson object mapper is easier and more robust (cherry picked from commit 40728244fd9f3186ebad998b0be16b55780b0069) (cherry picked from commit 8fb7e593c79be1a1af3b33b6416896e43873666b) - - - - - 77093a50 by Ard Schrijvers at 2016-09-27T20:52:33+02:00 HSTTWO-3812 [Backport 3.2] Account for feedback from Oscar: - mixin MIXIN_FORM_DATA_PAYLOAD should only be set if the flat structure feature is enabled - remove usage of FormField#getValues (cherry picked from commit b9924de4fd91c0cd58f8aea0f125f7b1af9ea1e4) (cherry picked from commit d18d0907692d37cab73afe06a529d27f664ce5e9) - - - - - b545800b by Ard Schrijvers at 2016-09-27T20:52:53+02:00 HSTTWO-3812 [Backport 3.2] Account for feedback from Oscar: - correct javadoc - rename hst:formId to hst:formid to be more in sync with other hst prop defs (cherry picked from commit 7d97bafe8ae29e5816668bb400c8f76d502e6295) (cherry picked from commit b8675eb6cc0c714e594659d864e853185f14323b) - - - - - 26135257 by Ard Schrijvers at 2016-09-27T20:53:11+02:00 HSTTWO-3812 [Backport 3.2] correct duplicate MIX_REFERENCEABLE import (cherry picked from commit f5f9252972ab6801d1ee7eabdcc3ad3f1f037c17) (cherry picked from commit 81d9636133d603d020bc1197286e50aabda95451) - - - - - c2fd441e by Ard Schrijvers at 2016-09-27T21:14:51+02:00 HSTTWO-3812 Explicitly include jackson-databind In version 4.x, jackson-databind is transitively pulled in by hst commons. This is not the case in 3.x, hence we need to add it explicitly - - - - - dd0cf371 by Ate Douma at 2016-09-28T23:37:31+02:00 HSTTWO-3809: [backport 10.2] bump cms and services-api version for using CmsSessionContext feature - - - - - b88965a9 by Ate Douma at 2016-09-29T01:22:08+02:00 HSTTWO-3809: [backport 10.2] using CmsContextService for handshake and context bridging with CMS application This depends on CMS-10456 providing the implementation and handling from CMS side. This backport also fully merges the earlier CmsSecurityValue changes for: - HSTTWO-3611: use CMS location instead of Referer for authentication URL - HSTTWO-3313: big overhaul of the CmsSecurityValve to make sure that in clustered setups ... (cherry picked from commit 5ace6aa84bd10c0ab390064a3331fb6eee99e63d) (cherry picked from commit e614bfaeff043963128d1a4ad2f460d13a65b22c) - - - - - db1992fb by Ate Douma at 2016-09-29T01:44:31+02:00 HSTTWO-3809: [backport 10.2] Reintegrate 'feature/cms-session-context' into release/3.2 - - - - - 24f47c31 by Ate Douma at 2016-09-29T02:01:46+02:00 HSTTWO-3809: [backport 10.2] adjust backported @deprecated since - - - - - 93306c0a by Oscar Scholten at 2016-10-04T17:13:18+02:00 HSTTWO-3816 [backport 10.2] take fmt:setLocale into account when determining current locale (cherry picked from commit ddd4ed755eb4eeac35b90653e2e0655182c0950c) - - - - - c9f22217 by Bert Leunis at 2016-10-21T10:36:19+02:00 HSTTWO-3808 Merge release/3.2 changes in bugfix/HSTTWO-3808 - - - - - 30 changed files: - api/pom.xml - api/src/main/java/org/hippoecm/hst/core/container/ContainerConstants.java - client-modules/cms-rest/pom.xml - client-modules/cms-rest/src/main/java/org/hippoecm/hst/cmsrest/container/CmsRestSecurityValve.java - client-modules/google-analytics/hst/pom.xml - client-modules/google-analytics/pom.xml - client-modules/google-analytics/repository/pom.xml - client-modules/page-composer/pom.xml - client-modules/pom.xml - client/pom.xml - client/src/main/java/org/hippoecm/hst/component/support/forms/FormField.java - client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java - client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java - client/src/main/java/org/hippoecm/hst/tag/HstCmsEditMenuTag.java - client/src/main/java/org/hippoecm/hst/tag/MessagesReplaceTag.java - client/src/main/java/org/hippoecm/hst/tag/SetHstBundleTag.java - client/src/main/java/org/hippoecm/hst/utils/TagUtils.java - cms-restapi/pom.xml - commons/pom.xml - components/core/pom.xml - components/core/src/main/java/org/hippoecm/hst/container/HstDelegateeFilterBean.java - components/core/src/main/java/org/hippoecm/hst/core/channelmanager/CmsComponentComponentWindowAttributeContributor.java - components/core/src/main/java/org/hippoecm/hst/core/container/CmsSecurityValve.java - components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager.properties - components/jaxrs/pom.xml - components/pom.xml - components/resourcebundle-cnd/pom.xml - components/resourcebundle/pom.xml - components/restapi/pom.xml - components/rewriter/pom.xml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/compare/2d1debc40fa04324de92d7a776e1df073c4884a6...c9f2221734714b35f85416e695ea5479afceb706
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
