Ard Schrijvers pushed to branch release/4.0 at cms-community / hippo-site-toolkit
Commits: 1bfec094 by Ard Schrijvers at 2016-10-17T12:40:42+02:00 HSTTWO-3840 [Backport 4.0] Make sure property placeholders are really replaced Also renamed 'annotationJsonSerializer' to a unique name (cherry picked from commit 76a72e5b45892c72e63bce243ef5de8f0edfa0d9) - - - - - acdef779 by Ard Schrijvers at 2016-10-17T12:41:20+02:00 HSTTWO-3840 [Backport 4.0] Make property placeholders replacement specific for SpringComponentManager-pagecomposer.xml Because the ftl files also contain parts that could be processed as property placeholders, it is better to make it very explicit that only the property placeholders for SpringComponentManager-pagecomposer.xml are replaced (cherry picked from commit 6d91a692b4b3a4b4466624043f7db5af97f388db) - - - - - 2 changed files: - client-modules/page-composer/pom.xml - client-modules/page-composer/src/main/resources/org/hippoecm/hst/pagecomposer/SpringComponentManager-pagecomposer.xml Changes: ===================================== client-modules/page-composer/pom.xml ===================================== --- a/client-modules/page-composer/pom.xml +++ b/client-modules/page-composer/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com) + Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -168,6 +168,25 @@ </includes> </testResource> </testResources> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>org/hippoecm/hst/pagecomposer/SpringComponentManager-pagecomposer.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>org/hippoecm/hst/pagecomposer/SpringComponentManager-pagecomposer.xml</exclude> + </excludes> + </resource> + </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> ===================================== client-modules/page-composer/src/main/resources/org/hippoecm/hst/pagecomposer/SpringComponentManager-pagecomposer.xml ===================================== --- a/client-modules/page-composer/src/main/resources/org/hippoecm/hst/pagecomposer/SpringComponentManager-pagecomposer.xml +++ b/client-modules/page-composer/src/main/resources/org/hippoecm/hst/pagecomposer/SpringComponentManager-pagecomposer.xml @@ -18,7 +18,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd";> - <bean id="annotationJsonSerializer" class="org.hippoecm.hst.rest.custom.AnnotationJsonSerializer"> + <bean id="pageComposerAnnotationJsonSerializer" class="org.hippoecm.hst.rest.custom.AnnotationJsonSerializer"> <constructor-arg type="java.lang.Class" value="java.lang.annotation.Annotation" /> </bean> @@ -33,7 +33,7 @@ </constructor-arg> <constructor-arg> <list> - <ref bean="annotationJsonSerializer"/> + <ref bean="pageComposerAnnotationJsonSerializer"/> </list> </constructor-arg> </bean> View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/compare/7049657c926feec636b6c611d9a71e20258e12b7...acdef779021f0a5b133d77802083875d5d68b9c4
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
