Canh Ngo pushed to branch master 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 - - - - - 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. - - - - - 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. - - - - - 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 - - - - - 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 - - - - - 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 - - - - - 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' - - - - - 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 - - - - - 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 - - - - - 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 - - - - - 9d780e4f by Tobias Jeger at 2016-05-31T13:49:07+02:00 HSTTWO-3582 Merge master changes into feature/cmng-psp1 - - - - - de56807d by Canh Ngo at 2016-06-01T09:18:16+02:00 HSTTWO-3582 merged master changes into feature/cmng-psp1 - - - - - 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 - - - - - 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 - - - - - 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 - - - - - 57 changed files: - api/pom.xml - 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/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/pom.xml - client-modules/cms-rest/src/main/resources/org/hippoecm/hst/cmsrest/SpringComponentManager-cmsrest.xml - 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/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/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/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/SiteMenuItemHelper.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 - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/sitemapresource/CRUDPageAndModifyContainerTest.java - client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/services/repositorytests/sitemapresource/ReApplyPrototypesTest.java - + client-modules/page-composer/src/test/java/org/hippoecm/hst/pagecomposer/jaxrs/util/PageComposerUtilTest.java - + client-modules/page-composer/src/test/resources/org/hippoecm/hst/pagecomposer/jaxrs/services/ContainerComponentResourceTest-test-containeritem.xml - client-modules/pom.xml - client/pom.xml - client/src/main/java/org/hippoecm/hst/tag/HstCmsEditLinkTag.java - client/src/main/java/org/hippoecm/hst/tag/HstCmsEditMenuTag.java - cms-restapi/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/efb3ee0605a98f1bb4109680e4ce049d9185c956...9670e8a8f7e3054d476fc2d9aebcc25c10a274ec
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
