Woonsan Ko pushed to branch feature/HSTTWO-3623 at cms-community / hippo-site-toolkit
Commits: be4a26c1 by Tobias Jeger at 2016-01-29T13:25:11+00:00 HSTTWO-3582: copy for branch hst-4.0.0-cmng - - - - - ad853f52 by Tobias Jeger at 2016-01-29T15:04:25+00:00 HSTTWO-3583: Initial draft to expose page meta-data at end of response payload (when requested inside the CM). - - - - - 4a09984b by Tobias Jeger at 2016-02-01T11:29:56+00:00 HSTTWO-3583: Add unit test for the new addEpilogue method in HstResponse. - - - - - 25c2da82 by Tobias Jeger at 2016-02-01T12:16:22+00:00 HSTTWO-3583: Update copyright year. - - - - - 0db8f560 by Tobias Jeger at 2016-02-02T08:59:30+00:00 CHANNELMGR-339: Detect channel changes and route them to the ChannelService. - - - - - c286d529 by Mathijs den Burger at 2016-02-08T11:23:32+01:00 HSTTWO-3582 Merge branch 'master' into feature/cmng-psp1 - - - - - 36f3423c by Tobias Jeger at 2016-02-08T12:04:07+01:00 HSTTWO-3588: Support GETting a single Channel (by id), add channel id to page meta data. - - - - - 32f59f4c by Arthur Bogaart at 2016-02-16T13:44:28+01:00 HSTTWO-1003 Remove redundant static final modifiers on String constants - - - - - 73354459 by Arthur Bogaart at 2016-02-16T17:49:00+01:00 HSTTWO-3595 Replace generic String "type" with "HST-Type" for container and container-item metadata attributes - - - - - e0f45cbb by Mathijs den Burger at 2016-02-17T09:19:54+01:00 HSTTWO-3588 code cleanup - bump copyright year - make local variable final - fix IntelliJ warnings - - - - - 30fe399c by Tobias Jeger at 2016-02-21T13:05:18+01:00 HSTTWO-3599: Fix ES-lint errors, improve consistency. - - - - - 1903ab86 by Tobias Jeger at 2016-02-23T09:13:40+01:00 HSTTWO-3599: Add fall-back if hst:label is not specified. Use CM constant for exposing a container's hst:xtype. - - - - - 57fa5a30 by Tobias Jeger at 2016-02-23T09:23:23+01:00 HSTTWO-3601: Add template and support for a transparent xtype. - - - - - aec9fa0c by Mathijs den Burger at 2016-02-23T15:31:11+01:00 HSTTWO-3599 bump copyright year - - - - - 731fc46d by Mathijs den Burger at 2016-02-23T15:37:38+01:00 HSTTWO-3601 bump copyright year - - - - - 583b6107 by Mathijs den Burger at 2016-02-24T12:32:20+01:00 HSTTWO-3603 add constant for 'inherited' channel manager property Also rename it to 'HST-Inherited'. - - - - - c5b84341 by Tobias Jeger at 2016-02-24T12:52:12+01:00 HSTTWO-3601: render a "end" comment for components and containers. - - - - - 543696a8 by Tobias Jeger at 2016-02-24T13:01:07+01:00 HSTTWO-3601: Make the end marker more different from the start marker. - - - - - 1d7def16 by Mathijs den Burger at 2016-02-24T17:05:47+01:00 HSTTWO-3601 fix typo in parameter name - - - - - b4cdbb4d by Mathijs den Burger at 2016-02-24T17:06:02+01:00 HSTTWO-3601 bump copyright year - - - - - 728c5281 by Mathijs den Burger at 2016-03-02T11:22:21+01:00 HSTTWO-3611 use CMS location instead of Referer for authentication URL The Referer header is not always the base of the CMS application anymore now that the CMS contains several AngularJs apps that first get their own index.html file (e.g. '/cms/angular/app/index.html)', which changes the Referer header in subsequent calls). - - - - - 75d240de by Joeri de Gooijer at 2016-03-07T16:23:36+01:00 HSTTWO-3582 merge master into feature/cmng-psp1 - - - - - 9785a477 by Tobias Jeger at 2016-03-09T12:06:22+01:00 HSTTWO-3614: Add support for setting the rendering mount id during the initial composermode call. This makes the timing of CM-related calls to the back-end independent of the calls issued by the preview iframe. - - - - - cd69c3fd by Mathijs den Burger at 2016-03-14T15:18:42+01:00 HSTTWO-3619 pass lastModified as part of container representation This simplifies the AngularJs frontend implementation. Also removed the itemUuid parameter since it was not used. - - - - - 9fbf44b1 by Mathijs den Burger at 2016-03-14T15:19:06+01:00 HSTTWO-3619 bump copyright year - - - - - 9018f046 by Tobias Jeger at 2016-03-14T21:11:04+01:00 HSTTWO-3620: Adjust the rendering of component metadata such that if the "root window" is a container item component or a container component, its metadata is rendered as well. - - - - - 94807314 by Tobias Jeger at 2016-03-15T11:49:11+01:00 HSTTWO-3620: remove page metadata when rendering a container or component. - - - - - 2642c91e by Tobias Jeger at 2016-03-18T09:01:18+01:00 HSTTWO-3582: merge master changes into feature branch. - - - - - 809c3ec1 by Canh Ngo at 2016-03-22T14:18:57+01:00 HSTTWO-3620: refactored the code to populate page metadata to a separated method - - - - - b9a64e38 by Ard Schrijvers at 2016-04-04T13:00:10+02:00 HSTTWO-3624 Make sure HippoBean also has an object converter instance Set the object converter on the bean during JcrContentBeanBinder#bind so the bean can also be used for calls like #getHtml returning another bean - - - - - 7139ea63 by Tobias Jeger at 2016-04-05T10:41:40+02:00 HSTTWO-3633: push private utility method as protected into abstract superclass. - - - - - bdda8e6a by Tobias Jeger at 2016-04-07T10:07:18+02:00 HSTTWO-3582 Merge master changes into feature/cmng-psp1 - - - - - 7c71e8ef by Tobias Jeger at 2016-04-07T21:43:36+02:00 HSTTWO-3635 Use path rather than form parameter for setvariant - - - - - 0b15e184 by Tobias Jeger at 2016-04-13T21:16:15+02:00 HSTTWO-3637 Add siteMapId to Channel meta-data This is used by the new Channel Manager in order to retrieve the "sitemap" of the currently viewed channel. - - - - - 554dcaa6 by Ard Schrijvers at 2016-04-18T11:10:52+02:00 HSTTWO-3640 Fixing incorrect redirect between http/https For mounts that are not mapped, the schemeagnostic logic is ignored - - - - - 1e3ca485 by Canh Ngo at 2016-04-19T22:43:56+02:00 HSTTWO-3644 refactored to return proper error codes Created the ContainerComponentService and refactored code from ContainerComponentResource. Created ErrorStatus containing error code and neccessary error parameters. - - - - - 30b59416 by Canh Ngo at 2016-04-19T22:44:10+02:00 HSTTWO-3644 fixed unittests after refactoring - - - - - 5e4bdafb by Canh Ngo at 2016-04-19T22:44:44+02:00 HSTTWO-3644 API path should not use verb the @POST method has already represented the create operation, so using 'create' verb in the path is not necessary. - - - - - d0738ba2 by Woonsan Ko at 2016-04-19T18:10:58-04:00 HSTTWO-3628: try to load spring managed hst component bean first by the fqcn - - - - - 34def2b5 by Tobias Jeger at 2016-04-20T09:04:28+02:00 HSTTWO-3646 Add workspace exists flag to channel meta data - - - - - 64b15127 by Mathijs den Burger at 2016-04-20T09:34:40+02:00 HSTTWO-3644 make internal constructor protected It's only used by subclasses. - - - - - 7011aa5b by Mathijs den Burger at 2016-04-20T09:36:04+02:00 HSTTWO-3644 move ErrorStatus to model package - - - - - 36fbde55 by Mathijs den Burger at 2016-04-20T09:45:51+02:00 HSTTWO-3646 bump copyright year - - - - - d3a12254 by Canh Ngo at 2016-04-20T17:40:18+02:00 HSTTWO-3644: integrated changes to mainline - - - - - 91eb530c by Canh Ngo at 2016-04-21T14:49:04+02:00 HSTTWO-3645: refactored #updateContainer() and #deleteContainer() Simplified code to handle exceptions in ContainerComponentResource Changed HTTP methods for #updateContainer() to 'PUT' and #deleteContainer() to 'DELETE' - - - - - aa4e9cbc by Canh Ngo at 2016-04-21T14:50:34+02:00 HSTTWO-3645: fixed unittests - - - - - bd499051 by Canh Ngo at 2016-04-21T15:08:27+02:00 HSTTWO-3645 removed 'update' verb from the path element - - - - - 89c4aa10 by Canh Ngo at 2016-04-21T16:06:36+02:00 HSTTWO-3645 simplified the response upon delete - - - - - 5fbc7bfa by Ard Schrijvers at 2016-04-21T17:07:59+02:00 HSTTWO-3596 Make sure that URL are created correctly for Mount that have ismapped=false The bug was a regression which was a result of the work on the container resources. Version 10 has the same problem, hence I will backport to 10 as well Added a unit test that did break before the fix and passes after the fix. Should also avoid future mistakes - - - - - db8bf218 by Ard Schrijvers at 2016-04-21T17:13:39+02:00 HSTTWO-3596 copyright - - - - - be201e08 by Tobias Jeger at 2016-04-22T10:51:54+02:00 HSTTWO-3645 Refactor container service for better maintainability - - - - - 1e6d0301 by Canh Ngo at 2016-04-22T17:09:28+02:00 HSTTWO-3650 added a method to create responses with 400 error code - - - - - 361b095a by Canh Ngo at 2016-04-22T17:11:39+02:00 HSTTWO-3650 extracted static method #getAnnotatedDefaultValues() Moved the static method ContainerItemComponentResource#getAnnotatedDefaultValues and its unit-test to a separate module - - - - - f60582ab by Canh Ngo at 2016-04-22T17:39:29+02:00 HSTTWO-3650 refactored ContainerItemComponentResource Created separated ContainerItemComponentService to handle business logic. The ContainerItemComponentResource is only to reply proper responses upon requests from client - - - - - 491d190b by Canh Ngo at 2016-04-25T13:33:50+02:00 HSTTWO-3650 refactored ContainerItemComponentResource Restored the original behavior of the #retainVariants() Combined the API to update variant with the API to update&rename variant Made message response to be consistent Return 400 when deleting a variant got a client-side error - - - - - 3aca140a by Canh Ngo at 2016-04-25T13:41:39+02:00 HSTTWO-3650 added unit-test to verify rest-endpoint behavior - - - - - 480555ed by Canh Ngo at 2016-04-25T15:17:04+02:00 HSTTWO-3650 restored the API that getting parameter of a variant - - - - - 1345646c by Canh Ngo at 2016-04-25T17:18:24+02:00 HSTTWO-3650 restored 'lastModifiedTimestamp' as header-param Because this API is only used in ExtJS, it would be simpler to use 'lastModifiedTimestamp' in the header-param, rather than in query-param - - - - - f176dacf by Tobias Jeger at 2016-04-25T21:20:01+02:00 HSTTWO-3651 Rename transparent container type to nomarkup - - - - - 277d9f50 by Tobias Jeger at 2016-04-26T09:42:08+02:00 HSTTWO-3650 Cosmetic improvements after review - - - - - af12a54c by Mathijs den Burger at 2016-04-26T16:00:04+02:00 HSTTWO-3651 Merge changes into mainline - - - - - 4465aa42 by Ate Douma at 2016-04-26T16:22:34+02:00 HSTTWO-1003: correct typo in license header - - - - - 952ee145 by Woonsan Ko at 2016-04-26T14:56:41-04:00 HSTTWO-3653: adding subtask diagnostics threshold option - - - - - d70c6e03 by Canh Ngo at 2016-04-28T12:48:03+02:00 HSTTWO-3647: created unittest to verify REST call responses - - - - - b38545ca by Canh Ngo at 2016-04-28T12:51:53+02:00 HSTTWO-3647: cleaned up import - - - - - 901194e5 by Unico Hommes at 2016-04-28T16:35:23+02:00 Revert "HSTTWO-3596 copyright" This reverts commit db8bf2189a584cebb50d7860d8cefe540c20602a - - - - - fc0d37a0 by Unico Hommes at 2016-04-28T16:36:29+02:00 Merge branch 'revert-db8bf218' into 'master' Revert "HSTTWO-3596 copyright" This reverts commit db8bf2189a584cebb50d7860d8cefe540c20602a See merge request !3 - - - - - 264f6cdc by Unico Hommes at 2016-04-28T16:36:51+02:00 Revert "HSTTWO-3596 Make sure that URL are created correctly for Mount that have ismapped=false" This reverts commit 5fbc7bfa54f0e035794228973e6f210840c13599 - - - - - e3d60d0e by Unico Hommes at 2016-04-28T16:37:08+02:00 Merge branch 'revert-5fbc7bfa' into 'master' Revert "HSTTWO-3596 Make sure that URL are created correctly for Mount that have ismapped=false" This reverts commit 5fbc7bfa54f0e035794228973e6f210840c13599 See merge request !4 - - - - - 99695270 by Unico Hommes at 2016-04-28T16:43:31+02:00 Revert "HSTTWO-1003: correct typo in license header" This reverts commit b3752014f23b86bfae9ab8898f7691a3ed350014 - - - - - 5251215d by Unico Hommes at 2016-04-28T16:44:23+02:00 Revert "HSTTWO-3649 [Backport 3.2.2] copyright" This reverts commit 0f63129fe8a884d20e5336d6afdec05342f5e62f - - - - - 8aaea4e0 by Canh Ngo at 2016-05-02T14:47:04+02:00 HSTTWO-3656 create REST enndpoint to get channel setting info - - - - - 091170bc by Canh Ngo at 2016-05-02T23:18:35+02:00 HSTTWO-3656 added 'channelPath' property to the Channel object The 'channelPath' is the path to the 'hst:channel' node - - - - - e04de00e by Canh Ngo at 2016-05-02T23:20:40+02:00 HSTTWO-3656 added a REST API to update channel setting properties - - - - - 7946a2c6 by Canh Ngo at 2016-05-03T09:11:26+02:00 HSTTWO-3656 moved #getChannels() to ChannelService - - - - - fa6603df by Canh Ngo at 2016-05-03T10:30:02+02:00 HSTTWO-3656 created unittest and refactor sharing code - - - - - 9bead0f0 by Canh Ngo at 2016-05-03T13:40:36+02:00 HSTTWO-3656 fixed typo: 'fieldsGroup' to 'fieldGroups' - - - - - 809e804d by Jasper Floor at 2016-05-03T16:58:04+02:00 HSTTWO-3589 remove trailing - ! when preceded by a space, also remove the space - - - - - 58b97aa7 by Jasper Floor at 2016-05-03T16:58:47+02:00 HSTTWO-3589 and also the class that does the work remove trailing - ! when preceded by a space, also remove the space - - - - - 0e33e61b by Canh Ngo at 2016-05-03T21:05:11+02:00 HSTTWO-3656 refactored API to return ChannelInfoDescription object The ChannelInfoDescription contains channel setting fields and the i18n resource of field titles - - - - - fc12a5a8 by Tobias Jeger at 2016-05-04T13:26:15+02:00 HSTTWO-3656 Rework after review - - - - - ef7ca48d by Saimir Muco at 2016-05-04T14:11:58+02:00 HSTTWO-3589 remove additional whitespaces between words - - - - - 75a52105 by Canh Ngo at 2016-05-04T14:57:04+02:00 HSTTWO-3656 checked if the channel contains custom properties Also renamed the method Channel#hasCustomProperties() to Channel#getHasCustomProperties(), otherwise it is not serialized as a JSON property. - - - - - be3eba76 by Mathijs den Burger at 2016-05-09T15:34:55+02:00 HSTTWO-3660 change cmseditlink meta-data This way it's more in line with the meta-data of other page structure elements. - - - - - d4ba0e06 by Tobias Jeger at 2016-05-10T12:39:52+02:00 HSTTWO-3661 Avoid container items below components when reapplying template - - - - - d74ccb1e by Tobias Jeger at 2016-05-10T13:54:57+02:00 HSTTWO-3661 Continue loop i.s.o. breaking out of it - - - - - c146676b by Ard Schrijvers at 2016-05-10T14:50:32+02:00 HSTTWO-3596 Make sure that URL are created correctly for Mount that have ismapped=false The bug was a regression which was a result of the work on the container resources. Version 10 has the same problem, hence I will backport to 10 as well Added a unit test that did break before the fix and passes after the fix. Should also avoid future mistakes - - - - - c71635df by Tobias Jeger at 2016-05-11T11:01:58+02:00 HSTTWO-3582 Merge master changes into feature/cmng-psp1 - - - - - eb21629b by Tobias Jeger at 2016-05-11T14:56:21+02:00 HSTTWO-3665 Improve metadata rendered by hst:cmseditmenu tag - - - - - 9efd1d72 by Canh Ngo at 2016-05-11T15:23:33+02:00 HSTTWO-3664 Returned channel setting property annotations - - - - - efa7a8cf by Canh Ngo at 2016-05-12T13:29:52+02:00 HSTTWO-3668 Reuse ChannelManager service to save channel setting - - - - - 60c589ef by Canh Ngo at 2016-05-12T17:16:30+02:00 HSTTWO-3668 deprecated old API #save(Channel) in ChannelManager - - - - - 4a6b1946 by Tobias Jeger at 2016-05-14T16:46:09+02:00 HSTTWO-3664 Simplify annotation enumeration - - - - - 6c4e9a97 by Tobias Jeger at 2016-05-14T16:46:44+02:00 HSTTWO-3664 Merge feature branch into mainline - - - - - 31741b41 by Tobias Jeger at 2016-05-14T20:38:23+02:00 HSTTWO-3664 Fix unit test - - - - - e1485d56 by Tobias Jeger at 2016-05-15T21:25:41+02:00 HSTTWO-3668 Cosmetic changes to make the refactoring better visible - - - - - dc2bb162 by Tobias Jeger at 2016-05-15T21:29:38+02:00 HSTTWO-3668 Merge feature branch into mainline - - - - - 8387f0a0 by Mathijs den Burger at 2016-05-17T09:40:53+02:00 HSTTWO-3665 Merge changes into mainline - - - - - f0fdc737 by Tobias Jeger at 2016-05-17T14:14:46+02:00 HSTTWO-3669 Add locked-by info to channel properties description - - - - - 70565c8a by Tobias Jeger at 2016-05-17T15:26:27+02:00 HSTTWO-3667 Add back-end support for the hideInChannelManager flag - - - - - 19f9e1ca by Mathijs den Burger at 2016-05-17T15:44:31+02:00 HSTTWO-3669 code cleanup: remove unused private field, log cause - - - - - f820e1d3 by Mathijs den Burger at 2016-05-17T15:51:19+02:00 HSTTWO-3667 rename isHideInChannelManager to isHiddenInChannelManager - - - - - a1d12811 by Mathijs den Burger at 2016-05-17T15:52:46+02:00 HSTTWO-3667 remove superfluous access modifiers Interface methods are always public. - - - - - 87cf9828 by Mathijs den Burger at 2016-05-17T15:53:15+02:00 HSTTWO-3667 Merge changes into mainline - - - - - 24c7c6c1 by Canh Ngo at 2016-05-18T10:49:52+02:00 HSTTWO-3664 simplified attribute to store annotation type Removed configurable attribute name 'typeFieldName' and use the constant attribute 'type' that stores a value of AnnotationType - - - - - 1b4647d8 by Canh Ngo at 2016-05-18T14:30:05+02:00 HSTTWO-3672 removed hidden and duplicated fields from channel info Give warnings on duplicate field declarations in ChannelInfo class - - - - - 2789c22a by Canh Ngo at 2016-05-18T15:54:53+02:00 HSTTWO-3672 removed fields without annotation from channel setting - - - - - 6b4973f8 by Tobias Jeger at 2016-05-20T11:30:02+02:00 HSTTWO-3672 Rework after review - - - - - 6b006e84 by Ard Schrijvers at 2016-05-25T15:25:21+02:00 HSTTWO-3653 use correct ordering imports - - - - - 9976f527 by Ard Schrijvers at 2016-05-25T15:29:04+02:00 HSTTWO-3653 Merge master changes into feature/HSTTWO-3653 - - - - - c17535b8 by Ard Schrijvers at 2016-05-25T15:30:09+02:00 HSTTWO-3653 Reintegrate feature/HSTTWO-3653 - - - - - f3e8e6bb by Ard Schrijvers at 2016-05-25T15:41:24+02:00 HSTTWO-3653 bump the hippo:version for hst-types.cnd because the cnd needs to be reloaded - - - - - 7719671b by Ard Schrijvers at 2016-05-26T11:56:24+02:00 HSTTWO-3589 Merge master changes into feature/HSTTWO-3589 - - - - - 556d38e1 by Ard Schrijvers at 2016-05-26T11:57:19+02:00 HSTTWO-3589 Reintegrate bugfix/HSTTWO-3589 - - - - - 126683d9 by Ard Schrijvers at 2016-05-26T15:40:56+02:00 HSTTWO-3659 Mak sure sitemap items are either created correctly decoded *or* return error What is allowed in the name (pathInfo) is: %40 or @ %20 or " " %41 or A %42 or B etc Not allowed are: %3a or %3A or : %2f or %2F or / %5c or %5C or \ %2e or %2E (note that using just "." in the cms new page creation does work) %3f or %3F or ? (where if you want to access the URL you need to use %3f instead of ?) %3b or %3B or ; (where if you want to access the URL you need to use %3b instead of ;) - - - - - 8b25a66e by Ard Schrijvers at 2016-05-26T15:48:44+02:00 HSTTWO-3659 Mak sure sitemap # or %23 is not allowed either - - - - - cdaa5311 by Ard Schrijvers at 2016-05-26T16:16:36+02:00 HSTTWO-3659 fix unit test - - - - - 4411f8a6 by Ard Schrijvers at 2016-05-27T13:03:16+02:00 HSTTWO-3658 SearchInputParsingUtils should not allow apostrophe ’ Apply fix as suggested by Saimir (great catch!). First foldToASCIIReplacer and then invoke removeInvalidAndEscapeChars, otherwise apostrophe variants are not removed but only ' - - - - - 9987ba9a by Michiel Eggermont at 2016-05-31T12:31:01+02:00 HSTTWO-3684 Fix JUnit test Spring 4.2 improved the http request and response mock implementations to conform better to the specs. This caused a test failure for the Expiration header because the mock now returns a formatted date string as specified by the RFC 1123 date format. - - - - - cc927429 by Oscar Scholten at 2016-05-31T13:02:24+02:00 HSTTWO-3622 Improving the caching settings for REST pipelines - removing noCacheResponseHeadersValve - adding pageInfoRenderingValve and pageCachingValve - updating unit tests that failed due to changes - - - - - 9d780e4f by Tobias Jeger at 2016-05-31T13:49:07+02:00 HSTTWO-3582 Merge master changes into feature/cmng-psp1 - - - - - d1ef6bca by Michiel Eggermont at 2016-05-31T13:54:34+02:00 HSTTWO-3684 Fix JUnit tests Test failures due to upgrading to Spring framwork 4.2. HeaderUtils tests failed because http servlet request and response mocks now return date formatted strings for Date related http headers. TestLoginServlet tests failed because MediaType class is now required for the http servlet request and response mocks, so we need a dependency on spring-web during testing. - - - - - 7b3bc2cc by Ard Schrijvers at 2016-05-31T15:53:40+02:00 HSTTWO-3683 Post a ChannelEvent on the synchronous event bus when a 'preview' of a channel is created - - - - - ae89ee27 by Ard Schrijvers at 2016-05-31T17:29:52+02:00 HSTTWO-3622 Reintegrate bugfix/HSTTWO-3622 - - - - - 56063c1e by Michiel Eggermont at 2016-06-01T09:10:01+02:00 Reintegrate feature/HSTTWO-3683 - - - - - de56807d by Canh Ngo at 2016-06-01T09:18:16+02:00 HSTTWO-3582 merged master changes into feature/cmng-psp1 - - - - - 1cc86701 by Michiel Eggermont at 2016-06-01T10:59:47+02:00 HSTTWO-3683 Fix copyright header - - - - - 5601b930 by Ard Schrijvers at 2016-06-01T11:00:12+02:00 HSTTWO-1003 attribute 'DefaultSitePipeline' instead of null in case of DefaultSitePipeline - - - - - f6a51662 by Ard Schrijvers at 2016-06-01T13:10:14+02:00 HSTTWO-3686 improved diagnostics output by showing including all (non cleanup) valve. Note the implementation looks a bit odd with the finally stopping only the last task, but I did not find another way with the pattern that each valve calls 'invokeNext' except the last one. Also of course, code wise, every valve its diagnostics output should be nested inside its preceding valve because a valve invokes the next valve. However, I did not want a deep nested HDC output where every valve wraps the time of another valve. Hence, the code change was done as it is checked in. - - - - - a0e6ce0f by Ard Schrijvers at 2016-06-01T13:18:43+02:00 HSTTWO-3683 fix unit tests which is needed because preview creation now also results in a channel event - - - - - 18f58f6f by Tobias Jeger at 2016-06-01T15:42:09+02:00 HSTTWO-3688 Fix menu item moving/ordering problem in the presence of a prototypeitem - - - - - 76bf9951 by Oscar Scholten at 2016-06-01T15:55:10+02:00 HSTTWO-3359 Improving SearchInputParsingUtils to treat special characters as word boundaries - applying and improving the patch from JIRA - updating the unit tests - making the new behavior the default - - - - - 055a8ec9 by Ard Schrijvers at 2016-06-01T16:14:15+02:00 HSTTWO-3685 do not set render parameter if the request is a resource request (resourceURL) - - - - - 154a06aa by Tobias Jeger at 2016-06-01T16:33:03+02:00 HSTTWO-3688 Fix unit tests - - - - - 82cc61ae by Ard Schrijvers at 2016-06-01T16:54:31+02:00 HSTTWO-3688 slightly simplified iteration by making use of NodeIterable - - - - - 202b29ad by Ard Schrijvers at 2016-06-01T16:59:52+02:00 HSTTWO-3688 use next() instead of nextNode() - - - - - 110ce4c3 by Ard Schrijvers at 2016-06-01T21:46:17+02:00 HSTTWO-3688 Reintegrate 'feature/cmng-psp1-HSTTWO-3688' into feature/cmng-psp1 - - - - - 82ea718f by Oscar Scholten at 2016-06-02T09:16:51+02:00 HSTTWO-3359 Adding additional unit tests - - - - - c984a658 by Ard Schrijvers at 2016-06-02T09:56:51+02:00 HSTTWO-1003 Remove public for interface methods *and* add @SuppressWarnings annotation The @SuppressWarnings annotation is to indicate that the method is not invoked ever from the HST code itself, but the method is documented at [1] for how to access the query manager if you do not have a request [1] https://www.onehippo.org/library/concepts/search/1-hstquery-bootstrapping.html - - - - - efb3ee06 by Ard Schrijvers at 2016-06-02T10:33:10+02:00 HSTTWO-3685 Reintegrate bugfix/HSTTWO-3685 - - - - - 98f1709b by Ard Schrijvers at 2016-06-02T11:05:18+02:00 HSTTWO-3469 deprecate hst:isSite Deprecated cnd property and hst:isSite and deprecated the api isSite methods. Log warnings when still used - - - - - b28d3bd6 by Canh Ngo at 2016-06-02T12:08:02+02:00 HSTTWO-3582 merged master changes into feature/cmng-psp1 - - - - - 9670e8a8 by Canh Ngo at 2016-06-02T12:08:02+02:00 HSTTWO-3582 Reintegrate feature/cmng-psp1 - - - - - 4cdfe0a4 by Canh Ngo at 2016-06-02T12:16:41+02:00 HSTTWO-3582 fixed version after reintegrate - - - - - f053edb7 by Canh Ngo at 2016-06-02T12:28:11+02:00 HSTTWO-3582 fixed version after reintegrate - - - - - 1ff3a32a by Ard Schrijvers at 2016-06-02T13:59:28+02:00 HSTTWO-3469 Reintegrate feature/HSTTWO-3469 - - - - - 5f3c3887 by Ard Schrijvers at 2016-06-03T11:06:27+02:00 HSTTWO-3692 avoid possible NPE Since the sitemap parameters come from a HashMap which allows null key or value, we need to check for null because Properties which extend from Hashtable does not allow null key or value - - - - - 52d16076 by Ard Schrijvers at 2016-06-03T11:24:38+02:00 HSTTWO-3692 avoid possible NPE in using Properties object we need to check for null because Properties which extend from Hashtable does not allow null key or value - - - - - 5619dbb5 by Ard Schrijvers at 2016-06-03T12:12:04+02:00 HSTTWO-1003 remove old folder which was deleted in an svn branch before - - - - - 94671f22 by Ard Schrijvers at 2016-06-03T15:07:11+02:00 HSTTWO-3359 added one extra use case with retainWordBoundaries = true - - - - - 10b737ca by Ard Schrijvers at 2016-06-03T15:07:11+02:00 HSTTWO-3359 corrected the retainWordBoundaries = false to 'true' since the default is true in all other methods Also the javadoc already indicated that it should be true - - - - - 3b930966 by Ard Schrijvers at 2016-06-03T15:07:38+02:00 HSTTWO-3359 Reintegrate bugfix/HSTTWO-3359 - - - - - 3a696614 by Woonsan Ko at 2016-06-03T11:26:28-04:00 Merge branch 'master' into feature/HSTTWO-3628 - - - - - 59307fce by Woonsan Ko at 2016-06-03T11:26:54-04:00 HSTTWO-3628: highering log level to info than debug - - - - - b6a57d56 by Ard Schrijvers at 2016-06-06T11:17:54+02:00 HSTTWO-3686 Reintegrate feature/HSTTWO-3686 - - - - - b29f8940 by Ard Schrijvers at 2016-06-06T11:22:32+02:00 HSTTWO-3628 bump copyright years - - - - - 18469ac6 by Ard Schrijvers at 2016-06-06T11:23:05+02:00 HSTTWO-3628 Reintegrate feature/HSTTWO-3628 - - - - - 8e0ef1f6 by Ard Schrijvers at 2016-06-06T13:21:01+02:00 HSTTWO-3692 only add param if key and value *NOT* null - - - - - bce42fec by Ard Schrijvers at 2016-06-06T13:28:57+02:00 HSTTWO-3387 Make HST page diagnostics show the class delegated to by Spring Bridge Apply patch from William - - - - - eecd711c by Ard Schrijvers at 2016-06-06T14:01:40+02:00 HSTTWO-3656 don't pull in the 'hippo-cms-api' - - - - - 3e2c642b by Woonsan Ko at 2016-06-06T09:47:41-04:00 Merge branch 'master' into feature/HSTTWO-3623 - - - - - 50 changed files: - api/src/main/java/org/hippoecm/hst/configuration/HstNodeTypes.java - api/src/main/java/org/hippoecm/hst/configuration/channel/Channel.java - api/src/main/java/org/hippoecm/hst/configuration/channel/ChannelManager.java - api/src/main/java/org/hippoecm/hst/configuration/channel/HstPropertyDefinition.java - api/src/main/java/org/hippoecm/hst/configuration/hosting/Mount.java - api/src/main/java/org/hippoecm/hst/content/tool/ContentBeansTool.java - api/src/main/java/org/hippoecm/hst/core/channelmanager/ChannelManagerConstants.java - api/src/main/java/org/hippoecm/hst/core/channelmanager/ComponentWindowAttributeContributor.java - api/src/main/java/org/hippoecm/hst/core/component/HstResponse.java - api/src/main/java/org/hippoecm/hst/core/component/HstResponseState.java - client-modules/cms-rest/src/main/resources/org/hippoecm/hst/cmsrest/SpringComponentManager-cmsrest.xml - client-modules/page-composer/pom.xml - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/builtin/components/StandardContainerComponent.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/api/ChannelEvent.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ChannelInfoDescription.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ErrorStatus.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/AbstractConfigResource.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelService.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ChannelServiceImpl.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerComponentResource.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerComponentService.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerComponentServiceImpl.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerItemComponentResource.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerItemComponentService.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerItemComponentServiceImpl.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/exceptions/ClientError.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/exceptions/ClientException.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/exceptions/InvalidNodeTypeException.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/exceptions/ItemNotFoundException.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/exceptions/ServerErrorException.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/exceptions/UnknownClientException.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/helpers/PagesHelper.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/helpers/SiteMapHelper.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/helpers/SiteMenuItemHelper.java - client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/validators/AbstractPathInfoValidator.java - + client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/util/PageComposerUtil.java - client-modules/page-composer/src/main/resources/org/hippoecm/hst/pagecomposer/SpringComponentManager-pagecomposer.xml - + client-modules/page-composer/src/main/resources/org/hippoecm/hst/pagecomposer/builtin/components/nomarkup.ftl - + client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/AbstractResourceTest.java - + client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerComponentResourceTest.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerItemComponentResourceTest.java - + client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerItemComponentServiceTest.java - + client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/JsonPojoMapperProvider.java - + client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResourceTest.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/exceptions/ClientExceptionTest.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/helpers/SiteMenuItemHelperTest.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/MountResourceTest.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/sitemapresource/AbstractSiteMapResourceTest.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/compare/69874edceadc1f6fd734085a80867d4ec04f8277...3e2c642b21e054b3116355c6e825006e8d3f6c26
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
