Jeroen Hoffman pushed to branch master at cms-community / hippo-essentials
Commits:
43320694 by Bert Leunis at 2017-10-17T13:07:54+02:00
ESSENTIALS-1104 improve beans structure
- - - - -
4502fe16 by Jeroen Hoffman at 2017-10-25T10:14:47+02:00
ESSENTIALS-1104 Reintegrate branch 'bugfix/ESSENTIALS-1104' into master
- - - - -
1 changed file:
- plugins/rest-services/src/main/resources/spring-plain-rest-api.xml
Changes:
=====================================
plugins/rest-services/src/main/resources/spring-plain-rest-api.xml
=====================================
--- a/plugins/rest-services/src/main/resources/spring-plain-rest-api.xml
+++ b/plugins/rest-services/src/main/resources/spring-plain-rest-api.xml
@@ -4,7 +4,6 @@
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.xsd";>
-
<import
resource="classpath:/org/hippoecm/hst/site/optional/jaxrs/SpringComponentManager-rest-jackson.xml"/>
<import
resource="classpath:/org/hippoecm/hst/site/optional/jaxrs/SpringComponentManager-rest-plain-pipeline.xml"/>
<import
resource="classpath:/org/hippoecm/hst/site/optional/jaxrs/SpringComponentManager-rest-content-pipeline.xml"/>
@@ -44,16 +43,27 @@
<property name="printStackTrace" value="false" />
</bean>
- <bean id="essentialsRestAllEntityProviders"
class="org.springframework.beans.factory.config.ListFactoryBean">
+ <bean id="essentialsRestEntityProviders"
class="org.springframework.beans.factory.config.ListFactoryBean">
<property name="sourceList">
<list>
- <ref bean="jaxrsRestJsonProvider"/>
<ref bean="jaxrsHippoContextProvider"/>
<ref bean="jaxrsRestExceptionMapper"/>
</list>
</property>
</bean>
+ <bean id="essentialsRestAllEntityProviders"
class="org.hippoecm.hst.site.container.TypeDeterminedMethodInvokingFactoryBean">
+ <constructor-arg value="java.util.List" />
+ <property name="targetClass"
value="org.apache.commons.collections.ListUtils" />
+ <property name="targetMethod" value="union" />
+ <property name="arguments">
+ <list>
+ <ref bean="jaxrsRestDefaultEntityProviders" />
+ <ref bean="essentialsRestEntityProviders" />
+ </list>
+ </property>
+ </bean>
+
<bean id="jaxrsRestPlainServiceValve"
class="org.hippoecm.hst.core.container.JaxrsRestServiceValve"
init-method="initialize" destroy-method="destroy">
<constructor-arg>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/f420535b269283403c5d3dbcbeed2ca2ec31da48...4502fe16ce099d76084a107b953fb7163c060de0
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/f420535b269283403c5d3dbcbeed2ca2ec31da48...4502fe16ce099d76084a107b953fb7163c060de0
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
