Michiel Rop pushed to branch feature/REPO-1835 at cms-community / hippo-repository
Commits: a353175a by Michiel Eggermont at 2017-07-31T16:09:14+02:00 REPO-1 Enable injecting QueryManager mock - - - - - 0490f91b by Sergey Shepelevich at 2017-09-25T13:03:59+02:00 REPO-1820 Change logging level to debug for 'Events processed' log message (cherry picked from commit 206b5b4e831afd8d70028b1dca7b739b31c889a1) - - - - - d8f2345d by Peter Centgraf at 2017-09-25T16:41:46+02:00 REPO-1829 Apply initial values for system properties (cherry picked from commit 98a8f2b96f387130d0dd5496addef5a8f0530beb) (cherry picked from commit 62e737e27129d95b4deaf1a20b426eab6d0ec1c4) - - - - - d761a51a by Ate Douma at 2017-09-25T16:41:46+02:00 REPO-1829 minor cleanup and removing reinitialization of SYSTEM properties on forceApply==true when node already exists Even in case of forceApply=true, SYSTEM properties should not get re-initialized (even if they no longer exist) iff the node already does (cherry picked from commit 84de99c8b377c522e502497a9917103dfe893c4d) (cherry picked from commit 02d14eb467accf44d222a88582404e90731039bf) - - - - - 1d7cf1a7 by Peter Centgraf at 2017-09-25T16:52:50+02:00 REPO-1821 admin user password and admin group membership are now system properties with default values (cherry picked from commit 3e12e086bb5ebbaaecfb02d621efc43e46652f40) (cherry picked from commit ce726c83fa8edb03fc2bffc8dd6ede966dc4c5f9) - - - - - 11e57a51 by Oscar Scholten at 2017-09-28T15:37:23+02:00 REPO-1797 Process upstream content definitions when re-sorting - Added support for storing order before in the baseline for content. - Added support for order-first ("") for content. - When re-sorting a node, upstream content definitions are now processed too. - After sorting, added a method that prints out warning for any inconsistencies. - Improved AutoExportIntegrationTest to be able to perform multiple start/stop runs. - Improved documentation. (cherry picked from commit a9d1af4b0f49f089fedea45d860baf041dcd595f) - - - - - 65af67d3 by Woonsan Ko at 2017-09-29T17:02:29+02:00 REPO-1810: fixing ResourceUtils usages to comply with cxf 3.1.12. - - - - - 5b660141 by Ate Douma at 2017-10-02T00:46:32+02:00 REPO-1839 Fix exporting ValueType for jcr URI, NAME and PATH property types and property jcr:mixinTypes with ValueType.NAME instead of ValueType.STRING (cherry picked from commit 1026762f15b7e8052c9e4dc6482aa155fba8b72e) - - - - - b668d247 by Michiel Rop at 2017-10-02T11:32:36+02:00 Merge branch 'feature/wpm-link-documents' into feature/REPO-1835 - - - - - 16b39bd2 by Michiel Rop at 2017-10-02T11:44:08+02:00 REPO-1835 Merge branch 'master' into feature/REPO-1835 - - - - - 63c0321a by Michiel Rop at 2017-10-02T12:59:36+02:00 REPO-1835 Make distinction between empty and null actionsMap The scxmlExecutor behaves differently for a actionMap that is null than for an empty one. In the latter case, there are no valid transitions. - - - - - a6f3076e by Michiel Rop at 2017-10-02T15:57:57+02:00 REPO-1835 Add requestIdentifier to builder Add requestIdentifier to builder in order to set the event payload key, value pair on the eventpayload and the allowed actions a started scxmlExecutor is necessary. If it has not been started, the feedback containing the requests has not been initialized yet. An additional benefit of adding the requestIdentifier to the builder is that callers of the api can also use workflowmethods that request a requestModifier using the new transitionMethod in combination with the DocumentWorkflowTransition.Builder. This approach seems preferably over introducing Futures, since the current cases of using a request Identifier all result in the same modification of the actionsMap and the eventPayload. Using Futures furthermore makes the api overly complex, without adding any new functionality. It's still possible to set the actionsMap as well. The available actions derived from the requestIdentifier are added in that case. - - - - - 30 changed files: - builtin/src/main/java/org/onehippo/repository/documentworkflow/DocumentWorkflowTransition.java - config/src/main/resources/hcm-config/group-author.yaml - config/src/main/resources/hcm-config/group-editor.yaml - engine/src/main/java/org/onehippo/cm/engine/BaselineResourceInputProvider.java - engine/src/main/java/org/onehippo/cm/engine/ConfigurationBaselineService.java - engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java - engine/src/main/java/org/onehippo/cm/engine/ConfigurationContentService.java - engine/src/main/java/org/onehippo/cm/engine/Constants.java - engine/src/main/java/org/onehippo/cm/engine/JcrContentExporter.java - engine/src/main/java/org/onehippo/cm/engine/JcrContentProcessor.java - engine/src/main/java/org/onehippo/cm/engine/ValueProcessor.java - engine/src/main/java/org/onehippo/cm/engine/autoexport/AutoExportConfigExporter.java - engine/src/main/java/org/onehippo/cm/engine/autoexport/DefinitionMergeService.java - engine/src/main/java/org/onehippo/cm/engine/autoexport/EventJournalProcessor.java - engine/src/main/java/org/onehippo/cm/engine/autoexport/orderbeforeholder/ConfigOrderBeforeHolder.java - engine/src/main/java/org/onehippo/cm/engine/autoexport/orderbeforeholder/ContentOrderBeforeHolder.java - engine/src/main/java/org/onehippo/cm/engine/autoexport/orderbeforeholder/OrderBeforeHolder.java - + engine/src/main/java/org/onehippo/cm/engine/autoexport/orderbeforeholder/OrderBeforeUtils.java - engine/src/main/java/org/onehippo/cm/engine/autoexport/orderbeforeholder/UpstreamConfigOrderBeforeHolder.java - engine/src/main/java/org/onehippo/cm/engine/impl/ContentDefinitionSorter.java - engine/src/main/resources/hcm-config/configuration.yaml - engine/src/main/resources/hcm-config/hcm.cnd - engine/src/test/java/org/onehippo/cm/engine/ConfigurationConfigServiceTest.java - engine/src/test/java/org/onehippo/cm/engine/ConfigurationContentServiceTest.java - engine/src/test/java/org/onehippo/cm/engine/JcrContentProcessorTest.java - engine/src/test/java/org/onehippo/cm/engine/autoexport/AutoExportIntegrationTest.java - engine/src/test/java/org/onehippo/cm/engine/autoexport/IsolatedRepository.java - + engine/src/test/resources/AutoExportIntegrationTest/reapply_content/cycle1/in/hcm-config/test.yaml - + engine/src/test/resources/AutoExportIntegrationTest/reapply_content/cycle1/in/hcm-content/node1.yaml - + engine/src/test/resources/AutoExportIntegrationTest/reapply_content/cycle1/in/hcm-content/node2.yaml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/compare/5129f38ba5a8b60ff37120eeb1df764b5d5627b0...a6f3076eb0c9cec84a0e2cd14a04ef3bcb98950c --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/compare/5129f38ba5a8b60ff37120eeb1df764b5d5627b0...a6f3076eb0c9cec84a0e2cd14a04ef3bcb98950c You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
