Ard Schrijvers pushed to branch master at cms-community / hippo-site-toolkit
Commits: 76a72e5b by Ard Schrijvers at 2016-10-14T17:17:44+02:00 HSTTWO-3839 Make sure property placeholders are really replaced Also renamed 'annotationJsonSerializer' to a unique name - - - - - 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. @@ -180,6 +180,12 @@ </includes> </testResource> </testResources> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </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/commit/76a72e5b45892c72e63bce243ef5de8f0edfa0d9
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
