NIFI-250: - Fixing use of the optimistic locking manager factory bean. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6b91546d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6b91546d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6b91546d
Branch: refs/heads/NIFI-250 Commit: 6b91546d9d04dcb127cada3cdc907e9ef98abf42 Parents: cc8b096 Author: Matt Gilman <[email protected]> Authored: Wed Feb 4 13:13:09 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Wed Feb 4 13:13:09 2015 -0500 ---------------------------------------------------------------------- .../nifi/web/spring/OptimisticLockingManagerFactoryBean.java | 6 ------ .../nifi-web-api/src/main/resources/nifi-web-api-context.xml | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6b91546d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/spring/OptimisticLockingManagerFactoryBean.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/spring/OptimisticLockingManagerFactoryBean.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/spring/OptimisticLockingManagerFactoryBean.java index 850d2fd..8112b7b 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/spring/OptimisticLockingManagerFactoryBean.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/spring/OptimisticLockingManagerFactoryBean.java @@ -16,16 +16,10 @@ */ package org.apache.nifi.web.spring; -import org.apache.nifi.cluster.manager.impl.WebClusterManager; -import org.apache.nifi.controller.FlowController; -import org.apache.nifi.controller.repository.FlowFileEventRepository; import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.web.ClusterAwareOptimisticLockingManager; -import org.apache.nifi.web.ClusterRequestException; import org.apache.nifi.web.OptimisticLockingManager; import org.apache.nifi.web.StandardOptimisticLockingManager; -import org.apache.nifi.web.dao.ControllerServiceDAO; -import org.apache.nifi.web.dao.impl.StandardControllerServiceDAO; import org.springframework.beans.BeansException; import org.springframework.beans.factory.FactoryBean; import org.springframework.context.ApplicationContext; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6b91546d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml index 61b68c5..94887c7 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml @@ -25,7 +25,9 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";> <!-- optimistic locking manager --> - <bean id="webOptimisticLockingManager" class="org.apache.nifi.web.spring.OptimisticLockingManagerFactoryBean" depends-on="clusterManagerOptimisticLockingManager"/> + <bean id="webOptimisticLockingManager" class="org.apache.nifi.web.spring.OptimisticLockingManagerFactoryBean" depends-on="clusterManagerOptimisticLockingManager"> + <property name="properties" ref="nifiProperties"/> + </bean> <!-- dto factory --> <bean id="dtoFactory" class="org.apache.nifi.web.api.dto.DtoFactory">
