Merged 5.2.N (5.2.1) to HEAD (5.2)

129165 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128488 jvonka: V1 REST API: Node Version History - add basic paging
      - tweak the (spring bean) config
      REPO-313


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:12:18 +00:00
parent 345f785239
commit d0209d157f

View File

@@ -791,17 +791,14 @@
<bean class="org.alfresco.rest.api.nodes.NodeChildrenRelation"> <bean class="org.alfresco.rest.api.nodes.NodeChildrenRelation">
<property name="nodes" ref="Nodes" /> <property name="nodes" ref="Nodes" />
</bean> </bean>
<bean class="org.alfresco.rest.api.nodes.NodeVersionsRelation">
<property name="serviceRegistry" ref="ServiceRegistry"/>
<property name="nodes" ref="Nodes" />
</bean>
<bean id="baseNodeRelation" class="org.alfresco.rest.api.nodes.AbstractNodeRelation" abstract="true"> <bean id="baseNodeRelation" class="org.alfresco.rest.api.nodes.AbstractNodeRelation" abstract="true">
<property name="serviceRegistry" ref="ServiceRegistry"/> <property name="serviceRegistry" ref="ServiceRegistry"/>
<property name="nodes" ref="Nodes" /> <property name="nodes" ref="Nodes" />
<property name="nodeAssocService" ref="NodeAssocService"/> <property name="nodeAssocService" ref="NodeAssocService"/>
</bean> </bean>
<bean class="org.alfresco.rest.api.nodes.NodeVersionsRelation" parent="baseNodeRelation"/>
<bean class="org.alfresco.rest.api.nodes.NodeSecondaryChildrenRelation" parent="baseNodeRelation"/> <bean class="org.alfresco.rest.api.nodes.NodeSecondaryChildrenRelation" parent="baseNodeRelation"/>